diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3097e060ff6f..47095e4e3bd1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,6 +67,18 @@ aliases:
         git checkout -B "$CIRCLE_BRANCH" "$CIRCLE_SHA1"
       fi
 
+  # Check if MMI Optional tests should run
+  - &check-mmi-optional
+    name: Check if MMI Optional tests should run
+    command: |
+      RUN_MMI_OPTIONAL=$(cat ./RUN_MMI_OPTIONAL)
+      if [[ "${CIRCLE_BRANCH}" == "develop" || "${RUN_MMI_OPTIONAL}" == "true" ]]; then
+        echo "Running MMI Optional tests"
+      else
+        echo "Skipping MMI Optional tests"
+        circleci step halt
+      fi
+
 workflows:
   test_and_release:
     jobs:
@@ -77,6 +89,7 @@ workflows:
       - trigger-beta-build:
           requires:
             - prep-deps
+      - check-pr-tag
       - prep-deps
       - test-deps-audit:
           requires:
@@ -120,6 +133,9 @@ workflows:
       - prep-build-multichain-test:
           requires:
             - prep-deps
+      - prep-build-confirmation-redesign-test:
+          requires:
+            - prep-deps
       - prep-build-test-mv3:
           requires:
             - prep-deps
@@ -132,6 +148,7 @@ workflows:
       - prep-build-test-mmi-playwright:
           requires:
             - prep-deps
+            - check-pr-tag
       - prep-build-storybook:
           requires:
             - prep-deps
@@ -154,9 +171,15 @@ workflows:
       - test-e2e-chrome-multichain:
           requires:
             - prep-build-multichain-test
+      - test-e2e-chrome-confirmation-redesign:
+          requires:
+            - prep-build-confirmation-redesign-test
       - test-e2e-firefox:
           requires:
             - prep-build-test
+      - test-e2e-firefox-confirmation-redesign:
+          requires:
+            - prep-build-confirmation-redesign-test
       - test-e2e-chrome-rpc:
           requires:
             - prep-build-test
@@ -269,6 +292,8 @@ workflows:
             - test-e2e-chrome
             - test-e2e-chrome-multichain
             - test-e2e-chrome-multiple-providers
+            - test-e2e-chrome-confirmation-redesign
+            - test-e2e-firefox-confirmation-redesign
             - test-e2e-firefox
             - test-e2e-chrome-flask
             - test-e2e-firefox-flask
@@ -373,6 +398,37 @@ jobs:
           name: Create GitHub Pull Request for version
           command: .circleci/scripts/release-create-release-pr.sh
 
+  check-pr-tag:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - run:
+          name: Check for MMI Team Tag
+          command: |
+            #!/bin/bash
+
+            GH_LABEL=team-mmi
+            if [ -z "$CIRCLE_PULL_REQUESTS" ]; then
+              exit 0
+            fi
+
+            echo $CIRCLE_PULL_REQUESTS | sed 's/,/\n/g'
+
+            # See if any associated PRs have matching label
+            HAS_MATCHING_PR=$(echo $CIRCLE_PULL_REQUESTS \
+              | sed -e 's#,#\n#g' -e 's#/github.com/#/api.github.com/repos/#g' -e 's#/pull/#/pulls/#g' \
+              | xargs -n1 curl -s \
+              | jq -s "map((.labels|map(select(.name==\"${GH_LABEL}\"))))|flatten|length > 0")
+
+            echo "${GH_LABEL} tag presence: ${HAS_MATCHING_PR}"
+
+            # assign the RUN_MMI_OPTIONAL variable
+            echo "${HAS_MATCHING_PR}" > ./RUN_MMI_OPTIONAL
+      - persist_to_workspace:
+          root: .
+          paths:
+            - RUN_MMI_OPTIONAL
+
   prep-deps:
     executor: node-browsers-medium
     steps:
@@ -640,6 +696,7 @@ jobs:
       - run: *shallow-git-clone
       - attach_workspace:
           at: .
+      - run: *check-mmi-optional
       - run:
           name: Build MMI extension for Playwright e2e
           command: |
@@ -654,6 +711,7 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
+            - RUN_MMI_OPTIONAL
             - dist-test-mmi-playwright
             - builds-test-mmi-playwright
       - store_artifacts:
@@ -725,6 +783,27 @@ jobs:
             - dist-test-multichain
             - builds-test-multichain
 
+  prep-build-confirmation-redesign-test:
+    executor: node-browsers-medium-plus
+    steps:
+      - run: *shallow-git-clone
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build extension for testing
+          command: ENABLE_CONFIRMATION_REDESIGN=1 yarn build:test
+      - run:
+          name: Move test build to 'dist-test' to avoid conflict with production build
+          command: mv ./dist ./dist-test-confirmations
+      - run:
+          name: Move test zips to 'builds-test' to avoid conflict with production build
+          command: mv ./builds ./builds-test-confirmations
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist-test-confirmations
+            - builds-test-confirmations
+
   prep-build-storybook:
     executor: node-browsers-medium-plus
     steps:
@@ -875,7 +954,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:chrome --retries 2 --debug
+              timeout 20m yarn test:e2e:chrome --retries 2
             fi
           no_output_timeout: 5m
       - store_artifacts:
@@ -902,7 +981,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:chrome --retries 2 --debug
+              timeout 20m yarn test:e2e:chrome --retries 2
             fi
           no_output_timeout: 5m
           environment:
@@ -913,6 +992,35 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e
 
+  test-e2e-chrome-confirmation-redesign:
+    executor: node-browsers-medium-plus
+    parallelism: 20
+    steps:
+      - run: *shallow-git-clone
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-confirmations ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-confirmations ./builds
+      - run:
+          name: test:e2e:chrome-confirmation-redesign
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              timeout 20m yarn test:e2e:chrome --retries 2
+            fi
+          no_output_timeout: 5m
+          environment:
+            ENABLE_CONFIRMATION_REDESIGN: 1
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - store_test_results:
+          path: test/test-results/e2e
+
   test-e2e-chrome-mv3:
     executor: node-browsers-medium-plus
     parallelism: 16
@@ -931,7 +1039,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:chrome --retries 2 --debug || echo "Temporarily suppressing MV3 e2e test failures"
+              timeout 20m yarn test:e2e:chrome --retries 2 || echo "Temporarily suppressing MV3 e2e test failures"
             fi
           no_output_timeout: 5m
       - store_artifacts:
@@ -1009,7 +1117,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:chrome:rpc --retries 2 --debug --build-type=mmi
+              timeout 20m yarn test:e2e:chrome:rpc --retries 2 --build-type=mmi
             fi
           no_output_timeout: 5m
       - store_artifacts:
@@ -1029,7 +1137,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              yarn test:e2e:single test/e2e/vault-decryption-chrome.spec.js --browser chrome --retries 2 --debug
+              yarn test:e2e:single test/e2e/vault-decryption-chrome.spec.js --browser chrome --retries 2
             fi
           no_output_timeout: 5m
 
@@ -1051,7 +1159,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:firefox:flask --retries 2 --debug
+              timeout 20m yarn test:e2e:firefox:flask --retries 2
             fi
           no_output_timeout: 5m
       - store_artifacts:
@@ -1078,7 +1186,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:chrome:flask --retries 2 --debug
+              timeout 20m yarn test:e2e:chrome:flask --retries 2
             fi
           no_output_timeout: 5m
       - store_artifacts:
@@ -1105,7 +1213,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:chrome:mmi --retries 2 --debug --build-type=mmi
+              timeout 20m yarn test:e2e:chrome:mmi --retries 2 --build-type=mmi
             fi
           no_output_timeout: 5m
       - store_artifacts:
@@ -1121,6 +1229,7 @@ jobs:
       - run: *shallow-git-clone
       - attach_workspace:
           at: .
+      - run: *check-mmi-optional
       - run:
           name: Move test build to dist
           command: mv ./dist-test-mmi-playwright ./dist
@@ -1172,7 +1281,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:firefox --retries 2 --debug
+              timeout 20m yarn test:e2e:firefox --retries 2
             fi
           no_output_timeout: 5m
       - store_artifacts:
@@ -1181,6 +1290,36 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e
 
+  test-e2e-firefox-confirmation-redesign:
+    executor: node-browsers-medium-plus
+    parallelism: 20
+    steps:
+      - run: *shallow-git-clone
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-confirmations ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-confirmations ./builds
+      - run:
+          name: test:e2e:firefox-confirmation-redesign
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              timeout 20m yarn test:e2e:firefox --retries 2
+            fi
+          no_output_timeout: 5m
+          environment:
+            ENABLE_CONFIRMATION_REDESIGN: 1
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - store_test_results:
+          path: test/test-results/e2e
+
+
   benchmark:
     executor: node-browsers-small
     steps:
@@ -1265,7 +1404,7 @@ jobs:
             - test-artifacts
 
   job-publish-prerelease:
-    executor: node-browsers-small
+    executor: node-browsers-medium
     steps:
       - checkout
       - attach_workspace:
@@ -1305,13 +1444,9 @@ jobs:
           path: test-artifacts
           destination: test-artifacts
       # important: generate lavamoat viz AFTER uploading builds as artifacts
-      # Temporarily disabled until we can update to a version of `sesify` with
-      # this fix included: https://github.com/LavaMoat/LavaMoat/pull/121
-      # Disabled 2024-03-25 due to flakiness.
-      #   - see: https://github.com/MetaMask/metamask-extension/issues/23704
-      #- run:
-      #    name: build:lavamoat-viz
-      #    command: ./.circleci/scripts/create-lavamoat-viz.sh
+      - run:
+          name: build:lavamoat-viz
+          command: ./.circleci/scripts/create-lavamoat-viz.sh
       - store_artifacts:
           path: build-artifacts
           destination: build-artifacts
@@ -1571,4 +1706,4 @@ jobs:
     steps:
       - run:
           name: All Tests Passed
-          command: echo 'weew - everything passed!'
+          command: echo 'whew - everything passed!'
diff --git a/.circleci/scripts/create-cherry-pick-pr.sh b/.circleci/scripts/create-cherry-pick-pr.sh
new file mode 100644
index 000000000000..da401345ac79
--- /dev/null
+++ b/.circleci/scripts/create-cherry-pick-pr.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+# Takes in 3 args
+# - 1 - Base PR Branch Name
+# - 2 - Commit Hash
+# - 3 - PR Number
+
+BASE_PR_BRANCH_NAME="${1}"
+COMMIT_HASH_TO_CHERRY_PICK="${2}"
+PR_BRANCH_NAME="chore/cherry-pick-${3}"
+PR_TITLE="chore: cherry-pick #${3}"
+PR_BODY="This PR cherry-picks #${3}"
+
+git config user.name "MetaMask Bot"
+git config user.email "metamaskbot@users.noreply.github.com"
+
+git checkout "${BASE_PR_BRANCH_NAME}"
+git pull
+git checkout -b "${PR_BRANCH_NAME}"
+git cherry-pick "${COMMIT_HASH_TO_CHERRY_PICK}"
+
+git push --set-upstream origin "${PR_BRANCH_NAME}"
+
+gh pr create \
+  --draft \
+  --title "${PR_TITLE}" \
+  --body "${PR_BODY}" \
+  --head "${BASE_PR_BRANCH_NAME}"
\ No newline at end of file
diff --git a/.circleci/scripts/create-lavamoat-viz.sh b/.circleci/scripts/create-lavamoat-viz.sh
index 4f2df2cdb1ce..135f8a461263 100755
--- a/.circleci/scripts/create-lavamoat-viz.sh
+++ b/.circleci/scripts/create-lavamoat-viz.sh
@@ -10,8 +10,33 @@ BUILD_DEST="./build-artifacts/build-viz/"
 # prepare artifacts dir
 mkdir -p "${BUILD_DEST}"
 
-# generate lavamoat debug config
+# generate lavamoat debug configs
 yarn lavamoat:debug:build
+yarn lavamoat:debug:webapp --parallel=false
 
+# generate entries for all present policy dirs under lavamoat/browserify
+# static entry for build-system
+POLICY_DIR_NAMES=$(find lavamoat/browserify -maxdepth 1 -mindepth 1 -type d -printf '%f ')
+
+POLICY_FILE_PATHS_JSON=$(echo -n "${POLICY_DIR_NAMES}" \
+  | jq --raw-input --slurp --indent 0 '
+    rtrimstr(" ")
+    | split(" ")
+    | map({
+        "key": .,
+        "value": {
+          "debug":  ("lavamoat/browserify/"+.+"/policy-debug.json"),
+          "override":"lavamoat/browserify/policy-override.json",
+          "primary":("lavamoat/browserify/"+.+"/policy.json")
+        }
+      })
+    | from_entries
+    |."build-system"= {
+        "debug":   "lavamoat/build-system/policy-debug.json",
+        "override":"lavamoat/build-system/policy-override.json",
+        "primary": "lavamoat/build-system/policy.json"
+      }'
+)
 # generate viz
-npx lavamoat-viz --dest "${BUILD_DEST}"
+# shellcheck disable=SC2086
+yarn lavamoat-viz --dest "${BUILD_DEST}" --policyNames build-system ${POLICY_DIR_NAMES} --policyFilePathsJson "${POLICY_FILE_PATHS_JSON}"
diff --git a/.eslintrc.js b/.eslintrc.js
index d57cc7bf7aef..a2207e6ba560 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -18,6 +18,10 @@ module.exports = {
   ignorePatterns: readFileSync('.prettierignore', 'utf8').trim().split('\n'),
   // eslint's parser, esprima, is not compatible with ESM, so use the babel parser instead
   parser: '@babel/eslint-parser',
+  plugins: ['@metamask/design-tokens'],
+  rules: {
+    '@metamask/design-tokens/color-no-hex': 'warn',
+  },
   overrides: [
     /**
      * == Modules ==
@@ -135,6 +139,7 @@ module.exports = {
         path.resolve(__dirname, '.eslintrc.typescript-compat.js'),
       ],
       rules: {
+        '@typescript-eslint/no-explicit-any': 'error',
         // this rule is new, but we didn't use it before, so it's off now
         '@typescript-eslint/no-duplicate-enum-values': 'off',
         '@typescript-eslint/no-shadow': [
@@ -438,5 +443,18 @@ module.exports = {
         ],
       },
     },
+    /**
+     * Don't check for static hex values in .test, .spec or .stories files
+     */
+    {
+      files: [
+        '**/*.test.{js,ts,tsx}',
+        '**/*.spec.{js,ts,tsx}',
+        '**/*.stories.{js,ts,tsx}',
+      ],
+      rules: {
+        '@metamask/design-tokens/color-no-hex': 'off',
+      },
+    },
   ],
 };
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 00c3678ffb6b..8eee07734755 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -51,3 +51,12 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 # For now, restricting approvals inside the .devcontainer folder to devs
 # who were involved with the Codespaces project.
 .devcontainer/                       @MetaMask/library-admins @HowardBraham @plasmacorral @brad-decker
+
+# Confirmations UX team to own code for confirmations on UI.
+ui/pages/confirmations               @MetaMask/confirmations-ux @MetaMask/confirmations-system-team
+
+# MMI team is responsible for code related with Institutioanl version of MetaMask
+ui/pages/institutional               @MetaMask/mmi
+ui/components/institutional          @MetaMask/mmi
+ui/ducks/institutional               @MetaMask/mmi
+ui/selectors/institutional           @MetaMask/mmi
\ No newline at end of file
diff --git a/.github/guidelines/LABELING_GUIDELINES.md b/.github/guidelines/LABELING_GUIDELINES.md
index 054cec4aff24..dbdd3b2ed9b8 100644
--- a/.github/guidelines/LABELING_GUIDELINES.md
+++ b/.github/guidelines/LABELING_GUIDELINES.md
@@ -12,7 +12,8 @@ It's essential to ensure that PRs have the appropriate labels before they are co
 - **release-x.y.z**: This label is automatically added to a PR and its linked issues upon the PR's merge. The `x.y.z` in the label represents the version in which the changes from the PR will be included. This label is auto-generated by a [GitHub action](../workflows/add-release-label.yml), which determines the version by incrementing the minor version number from the most recent release. Manual intervention is only required in specific cases. For instance, if a merged PR is cherry-picked into a release branch, typically done to address Release Candidate (RC) bugs, the label would need to be manually updated to reflect the correct version.
 - **regression-prod-x.y.z**: This label is automatically added to a bug report issue at the time of its creation. The `x.y.z` in the label represents the version in which the bug first appeared. This label is auto-generated by a [GitHub action](../workflows/check-template-and-add-labels.yml), which determines the `x.y.z` value based on the version information provided in the bug report issue form. Manual intervention is only necessary under certain circumstances. For example, if a user submits a bug report and specifies the version they are currently using, but the bug was actually introduced in a prior version, the label would need to be manually updated to accurately reflect the version where the bug originated.
 
-### Optional QA labels:
+### Optional labels:
+- **regression-develop**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on development branch (i.e. `develop`), but is not yet released in production.
 - **needs-qa**: If the PR includes a new features, complex testing steps, or large refactors, this label must be added to indicated PR requires a full manual QA prior being merged and added to a release.
 
 ### Labels prohibited when PR needs to be merged:
diff --git a/.github/scripts/check-pr-has-required-labels.ts b/.github/scripts/check-pr-has-required-labels.ts
index 15ef77022ceb..354dc2c2aa7d 100644
--- a/.github/scripts/check-pr-has-required-labels.ts
+++ b/.github/scripts/check-pr-has-required-labels.ts
@@ -73,7 +73,7 @@ async function main(): Promise<void> {
   if (!hasTeamLabel) {
     errorMessage += 'No team labels found on the PR. ';
   }
-  errorMessage += `Please make sure the PR is appropriately labeled before merging it.\n\nSee labeling guidelines for more detail: https://github.com/MetaMask/metamask-extension/blob/develop/.github/LABELING_GUIDELINES.md`;
+  errorMessage += `Please make sure the PR is appropriately labeled before merging it.\n\nSee labeling guidelines for more detail: https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md`;
   core.setFailed(errorMessage);
   process.exit(1);
 }
diff --git a/.github/workflows/add-mmi-reviewer-and-notify.yml b/.github/workflows/add-mmi-reviewer-and-notify.yml
new file mode 100644
index 000000000000..8821ccbd36e9
--- /dev/null
+++ b/.github/workflows/add-mmi-reviewer-and-notify.yml
@@ -0,0 +1,48 @@
+name: Notify MMI team via Slack
+
+on:
+  pull_request_target:
+    branches:
+      - develop
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - labeled
+
+jobs:
+  process-label:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - name: Notify MMI team via Slack
+        if: contains(github.event.pull_request.labels.*.name, 'team-mmi')
+        uses: slackapi/slack-github-action@007b2c3c751a190b6f0f040e47ed024deaa72844
+        with:
+          status: custom
+          fields: repo,message,commit,author,action
+          payload: |
+            {
+              "text": "A PR with label 'team-mmi' was added and requires review: ${{ github.event.pull_request.html_url }} in ${{ github.repository }}",
+              "attachments": [
+                {
+                  "color": "#2eb886",
+                  "fields": [
+                    {
+                      "title": "Repository",
+                      "value": "${{ github.repository }}",
+                      "short": true
+                    },
+                    {
+                      "title": "PR",
+                      "value": "#${{ github.event.pull_request.number }}",
+                      "short": true
+                    }
+                  ]
+                }
+              ]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.MMI_LABEL_SLACK_WEBHOOK_URL }}
\ No newline at end of file
diff --git a/.github/workflows/add-release-label.yml b/.github/workflows/add-release-label.yml
index 3acc4e22af10..1c66daa4eb72 100644
--- a/.github/workflows/add-release-label.yml
+++ b/.github/workflows/add-release-label.yml
@@ -13,12 +13,12 @@ jobs:
     if: github.event.pull_request.merged == true
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             fetch-depth: 0 # This is needed to checkout all branches
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: yarn
diff --git a/.github/workflows/check-pr-labels.yml b/.github/workflows/check-pr-labels.yml
index cfd48e22c8b6..4d36c48650a7 100644
--- a/.github/workflows/check-pr-labels.yml
+++ b/.github/workflows/check-pr-labels.yml
@@ -18,12 +18,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             fetch-depth: 1 # This retrieves only the latest commit.
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: yarn
diff --git a/.github/workflows/check-template-and-add-labels.yml b/.github/workflows/check-template-and-add-labels.yml
index e5311b70d22e..85391473b72e 100644
--- a/.github/workflows/check-template-and-add-labels.yml
+++ b/.github/workflows/check-template-and-add-labels.yml
@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1 # This retrieves only the latest commit.
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: yarn
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 0f7977000c63..c6fc7e658eea 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -14,7 +14,7 @@ jobs:
       contents: write
     steps:
       - name: "CLA Signature Bot"
-        uses: MetaMask/cla-signature-bot@v3.0.2
+        uses: MetaMask/cla-signature-bot@v4.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/close-bug-report.yml b/.github/workflows/close-bug-report.yml
index 7d520c30fafc..977700e1ca5d 100644
--- a/.github/workflows/close-bug-report.yml
+++ b/.github/workflows/close-bug-report.yml
@@ -13,12 +13,12 @@ jobs:
     if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'Version-v')
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             fetch-depth: 1 # This retrieves only the latest commit.
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: yarn
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e5c1eb06b588..73670c46d75d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml
new file mode 100644
index 000000000000..7773a3e42b0f
--- /dev/null
+++ b/.github/workflows/create-cherry-pick-pr.yml
@@ -0,0 +1,31 @@
+name: Cherry Pick Commit
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch_name:
+        description: 'Branch name you want the cherry-pick branch to be based from'
+        required: true
+      commit_hash:
+        description: 'Commit Hash'
+        required: true
+      PR_number:
+        description: 'PR # Associated with Cherry Pick'
+        required: true
+
+
+jobs:
+  cherry-pick:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Create Cherry Pick PR
+      id: create-cherry-pick-pr
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        ./scripts/create-cherry-pick-pr.sh ${{ github.event.inputs.branch_name }} ${{ github.event.inputs.commit_hash }} ${{ github.event.inputs.PR_number }}
\ No newline at end of file
diff --git a/.github/workflows/crowdin-action.yml b/.github/workflows/crowdin-action.yml
index a77592321684..94bd8016cd4f 100644
--- a/.github/workflows/crowdin-action.yml
+++ b/.github/workflows/crowdin-action.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: crowdin action
       uses: crowdin/github-action@a3160b9e5a9e00739392c23da5e580c6cabe526d
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3d28f7886f3a..a1c5cc29a575 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     name: Check workflows
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download actionlint
         id: download-actionlint
         run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/7fdc9630cc360ea1a469eed64ac6d78caeda1234/scripts/download-actionlint.bash) 1.6.23
diff --git a/.github/workflows/security-code-scanner.yml b/.github/workflows/security-code-scanner.yml
index 6b75b0d98bd0..7da1773d666c 100644
--- a/.github/workflows/security-code-scanner.yml
+++ b/.github/workflows/security-code-scanner.yml
@@ -32,5 +32,5 @@ jobs:
             node_modules
           rules_excluded:
             example
-          mixpanel_project_token: ${{secrets.SECURITY_CODE_SCANNER_MIXPANEL_TOKEN}}
+          project_metrics_token: ${{secrets.SECURITY_SCAN_METRICS_TOKEN}}
           slack_webhook: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index afe3fe367504..61d549728d99 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -4,17 +4,27 @@ on:
     secrets:
       SONAR_TOKEN:
         required: true
+#  pull_request:
+#    branches:
+#      - develop
+#    types:
+#      - opened
+#      - reopened
+#      - synchronize
+#      - labeled
+#      - unlabeled
+
 jobs:
   sonarcloud:
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for better relevancy of analysis
       - name: SonarCloud Scan
-        # v1.9.1
-        uses: SonarSource/sonarcloud-github-action@5875562561d22a34be0c657405578705a169af6c
+        # This is SonarSource/sonarcloud-github-action@v2.0.0
+        uses: SonarSource/sonarcloud-github-action@4b4d7634dab97dcee0b75763a54a6dc92a9e6bc1
         with:
           args: >
             -Dsonar.javascript.lcov.reportPaths=tests/coverage/lcov.info
diff --git a/.github/workflows/stale-issues-pr.yml b/.github/workflows/stale-issues-pr.yml
index 42da445b1376..5ad068a64fbb 100644
--- a/.github/workflows/stale-issues-pr.yml
+++ b/.github/workflows/stale-issues-pr.yml
@@ -12,7 +12,8 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@72afbce2b0dbd1d903bb142cebe2d15dc307ae57
+      # this is a hash for actions/stale@v9.0.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e
         with:
           stale-issue-label: 'stale'
           only-issue-labels: 'type-bug'
diff --git a/.github/workflows/update-lavamoat-policies.yml b/.github/workflows/update-lavamoat-policies.yml
index 593b3692c57c..fa0740b72930 100644
--- a/.github/workflows/update-lavamoat-policies.yml
+++ b/.github/workflows/update-lavamoat-policies.yml
@@ -12,7 +12,7 @@ jobs:
     outputs:
       IS_FORK: ${{ steps.is-fork.outputs.IS_FORK }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Determine whether this PR is from a fork
         id: is-fork
         run: echo "IS_FORK=$(gh pr view --json isCrossRepository --jq '.isCrossRepository' "${PR_NUMBER}" )" >> "$GITHUB_OUTPUT"
@@ -28,7 +28,7 @@ jobs:
     if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: React to the comment
         run: |
           gh api \
@@ -52,14 +52,14 @@ jobs:
       COMMIT_SHA: ${{ steps.commit-sha.outputs.COMMIT_SHA }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checkout pull request
         run: gh pr checkout "${PR_NUMBER}"
         env:
           GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
           PR_NUMBER: ${{ github.event.issue.number }}
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -76,14 +76,14 @@ jobs:
       - prepare
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checkout pull request
         run: gh pr checkout "${PR_NUMBER}"
         env:
           GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
           PR_NUMBER: ${{ github.event.issue.number }}
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -110,14 +110,14 @@ jobs:
       - update-lavamoat-build-policy
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checkout pull request
         run: gh pr checkout "${PR_NUMBER}"
         env:
           GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
           PR_NUMBER: ${{ github.event.issue.number }}
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -151,7 +151,7 @@ jobs:
     if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Use PAT to ensure that the commit later can trigger status check workflows
           token: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
@@ -251,7 +251,7 @@ jobs:
       - is-fork-pull-request
       - check-status
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
       - name: Post comment if the update failed
diff --git a/.github/workflows/validate-conventional-commits.yml b/.github/workflows/validate-conventional-commits.yml
index aaed4ee1e6ec..8cb416844339 100644
--- a/.github/workflows/validate-conventional-commits.yml
+++ b/.github/workflows/validate-conventional-commits.yml
@@ -3,13 +3,13 @@ on:
   pull_request:
     branches:
       - develop
-    types: [opened, edited, reopened]
+    types: [opened, edited, reopened, synchronize]
 
 jobs:
   pr-title-linter:
     runs-on: ubuntu-latest
     steps:
-    # this is a hash for amannn/action-semantic-pull-request@v5.2.0
-    - uses: amannn/action-semantic-pull-request@c3cd5d1ea3580753008872425915e343e351ab54
+    # this is a hash for amannn/action-semantic-pull-request@v5.4.0
+    - uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 642526e93a27..5949ba633724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ test/e2e/mmi/playwright.config.ts
 test/e2e/mmi/specs/**/*-darwin.png
 test/e2e/mmi/dist/
 
+lavamoat/**/policy-debug.json
diff --git a/.metamaskrc.dist b/.metamaskrc.dist
index d2663f882a52..e45a7740afc3 100644
--- a/.metamaskrc.dist
+++ b/.metamaskrc.dist
@@ -21,3 +21,9 @@ BLOCKAID_PUBLIC_KEY=
 ; SELENIUM_HEADLESS=
 ; Set this to 1 to make chrome e2e tests disable DoH/DoT and use system DNS
 ; SELENIUM_USE_SYSTEM_DNS=
+
+
+ENABLE_CONFIRMATION_REDESIGN=
+
+; Enables the Settings Page - Developer Options
+; ENABLE_SETTINGS_PAGE_DEV_OPTIONS=true
diff --git a/.storybook/main.js b/.storybook/main.js
index 67b47fd72c04..2a48b3b88654 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -64,6 +64,7 @@ module.exports = {
         {
           loader: 'css-loader',
           options: {
+            esModule: false,
             import: false,
             url: false,
           },
@@ -83,6 +84,15 @@ module.exports = {
     config.plugins.push(
       new CopyWebpackPlugin({
         patterns: [
+          {
+            from: path.join(
+              'ui',
+              'css',
+              'utilities',
+              'fonts/',
+            ),
+            to: 'fonts',
+          },
           {
             from: path.join(
               'node_modules',
diff --git a/.vscode/cspell.json b/.vscode/cspell.json
new file mode 100644
index 000000000000..24e3747bfa9b
--- /dev/null
+++ b/.vscode/cspell.json
@@ -0,0 +1,84 @@
+{
+  "ignorePaths": ["app/images", "package.json"],
+  "ignoreWords": [
+    "acitores",
+    "autofetch",
+    "azuretools",
+    "Brainstem",
+    "C01LUJL3T98",
+    "C05QXJA7NP8",
+    "cids",
+    "eamodio",
+    "initialisation",
+    "koalaman",
+    "mockttp",
+    "multibase",
+    "multicodec",
+    "namelookup",
+    "pluggable",
+    "protobufjs",
+    "regadas",
+    "remotedev",
+    "rvest",
+    "sesify",
+    "siginsights",
+    "testrpc",
+    "txinsights",
+    "webextension",
+    "xvfb"
+  ],
+  "useGitignore": true,
+  "version": "0.2",
+  "words": [
+    "bignumber",
+    "blockaid",
+    "browserlistrc",
+    "cimg",
+    "codecov",
+    "codespace",
+    "codespaces",
+    "corepack",
+    "datetime",
+    "datetimes",
+    "dedupe",
+    "depcheck",
+    "devcontainer",
+    "devcontainers",
+    "endregion",
+    "ensdomains",
+    "flamegraph",
+    "FONTCONFIG",
+    "hardfork",
+    "hexstring",
+    "jazzicon",
+    "keccak",
+    "lavadome",
+    "lavamoat",
+    "lavapack",
+    "lockdown",
+    "metamaskbot",
+    "metamaskrc",
+    "metametrics",
+    "mocharc",
+    "MULTICHAIN",
+    "MULTIPROVIDER",
+    "npmcli",
+    "onboarded",
+    "pageload",
+    "petnames",
+    "pipefail",
+    "quickstart",
+    "recompiles",
+    "shellcheck",
+    "sourcemaps",
+    "sprintf",
+    "testcase",
+    "TESTFILES",
+    "testid",
+    "tsbuildinfo",
+    "tsconfigs",
+    "typecheck",
+    "yargs",
+    "yarnpkg"
+  ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 49dda3b55d2d..e801fb65f8b7 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -38,7 +38,7 @@
       "type": "pickString",
       "id": "browserToUse",
       "description": "Which browser do you want to test with?",
-      "options": ["chrome", "firefox"],
+      "options": ["chrome", "firefox", "all"],
       "default": "chrome"
     }
   ],
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5eca75a9f539..02c20a82219a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,4 @@
 {
-  "cSpell.words": ["blockaid", "lavamoat"],
   "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
   "editor.tabSize": 2,
   "files.associations": {
diff --git a/.yarn/patches/@metamask-assets-controllers-patch-0f46262fea.patch b/.yarn/patches/@metamask-assets-controllers-patch-0f46262fea.patch
new file mode 100644
index 000000000000..2c0f9d1abbbc
--- /dev/null
+++ b/.yarn/patches/@metamask-assets-controllers-patch-0f46262fea.patch
@@ -0,0 +1,40 @@
+diff --git a/dist/NftDetectionController.js b/dist/NftDetectionController.js
+index 24373e328d3600d1168914a3dc0bbbd905b19ebe..3877bebee24d1ad5cd2183b50547e8cef1846558 100644
+--- a/dist/NftDetectionController.js
++++ b/dist/NftDetectionController.js
+@@ -36,7 +36,7 @@ class NftDetectionController extends polling_controller_1.StaticIntervalPollingC
+      * @param config - Initial options used to configure this controller.
+      * @param state - Initial state to set on this controller.
+      */
+-    constructor({ chainId: initialChainId, getNetworkClientById, onPreferencesStateChange, onNetworkStateChange, getOpenSeaApiKey, addNft, getNftApi, getNftState, }, config, state) {
++    constructor({ chainId: initialChainId, getNetworkClientById, onPreferencesStateChange, onNetworkStateChange, getOpenSeaApiKey, addNft, getNftApi, getNftState, disabled: initialDisabled, selectedAddress: initialSelectedAddress }, config, state) {
+         super(config, state);
+         /**
+          * Name of this controller used during composition
+@@ -54,8 +54,8 @@ class NftDetectionController extends polling_controller_1.StaticIntervalPollingC
+         this.defaultConfig = {
+             interval: DEFAULT_INTERVAL,
+             chainId: initialChainId,
+-            selectedAddress: '',
+-            disabled: true,
++            selectedAddress: initialSelectedAddress,
++            disabled: initialDisabled,
+         };
+         this.initialize();
+         this.getNftState = getNftState;
+diff --git a/dist/Standards/NftStandards/ERC721/ERC721Standard.js b/dist/Standards/NftStandards/ERC721/ERC721Standard.js
+index d9286b0c0e607d2857f3ee7dad40d13a6c11d7d7..4e12e4b590b1f34a66602d63035f1905917f8c93 100644
+--- a/dist/Standards/NftStandards/ERC721/ERC721Standard.js
++++ b/dist/Standards/NftStandards/ERC721/ERC721Standard.js
+@@ -66,7 +66,10 @@ class ERC721Standard {
+             const contract = new contracts_1.Contract(address, metamask_eth_abis_1.abiERC721, this.provider);
+             const supportsMetadata = yield this.contractSupportsMetadataInterface(address);
+             if (!supportsMetadata) {
+-                throw new Error('Contract does not support ERC721 metadata interface.');
++                // Do not throw error here, supporting Metadata interface is optional even though majority of ERC721 nfts do support it.
++                // This change is made because of instances of NFTs that are ERC404( mixed ERC20 / ERC721 implementation).
++                // As of today, ERC404 is unofficial but some people use it, the contract does not support Metadata interface, but it has the tokenURI() fct.
++                console.error('Contract does not support ERC721 metadata interface.');
+             }
+             return contract.tokenURI(tokenId);
+         });
diff --git a/.yarn/patches/@metamask-assets-controllers-patch-7616cc1669.patch b/.yarn/patches/@metamask-assets-controllers-patch-7616cc1669.patch
new file mode 100644
index 000000000000..6231d02d46f1
--- /dev/null
+++ b/.yarn/patches/@metamask-assets-controllers-patch-7616cc1669.patch
@@ -0,0 +1,57 @@
+diff --git a/dist/AssetsContractController.js b/dist/AssetsContractController.js
+index e8bae0bc514db69398fc2c378ca42eeb8f135e60..33c1e894f0318a59ec43f1b0a51500118c49bef6 100644
+--- a/dist/AssetsContractController.js
++++ b/dist/AssetsContractController.js
+@@ -40,6 +40,13 @@ exports.SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID = {
+     [assetsUtil_1.SupportedTokenDetectionNetworks.optimism]: '0xB1c568e9C3E6bdaf755A60c7418C269eb11524FC',
+     [assetsUtil_1.SupportedTokenDetectionNetworks.base]: '0x6AA75276052D96696134252587894ef5FFA520af',
+     [assetsUtil_1.SupportedTokenDetectionNetworks.zksync]: '0x458fEd3144680a5b8bcfaa0F9594aa19B4Ea2D34',
++    [assetsUtil_1.SupportedTokenDetectionNetworks.cronos]: '0x768ca200f0fc702ac9ea502498c18f5eff176378',
++    [assetsUtil_1.SupportedTokenDetectionNetworks.celo]: '0x6aa75276052d96696134252587894ef5ffa520af',
++    [assetsUtil_1.SupportedTokenDetectionNetworks.gnosis]: '0x6aa75276052d96696134252587894ef5ffa520af',
++    [assetsUtil_1.SupportedTokenDetectionNetworks.fantom]: '0x6aa75276052d96696134252587894ef5ffa520af',
++    [assetsUtil_1.SupportedTokenDetectionNetworks.polygon_zkevm]: '0x6aa75276052d96696134252587894ef5ffa520af',
++    [assetsUtil_1.SupportedTokenDetectionNetworks.moonbeam]: '0x6aa75276052d96696134252587894ef5ffa520af',
++    [assetsUtil_1.SupportedTokenDetectionNetworks.moonriver]: '0x6aa75276052d96696134252587894ef5ffa520af',
+ };
+ exports.MISSING_PROVIDER_ERROR = 'AssetsContractController failed to set the provider correctly. A provider must be set for this method to be available';
+ /**
+diff --git a/dist/assetsUtil.d.ts b/dist/assetsUtil.d.ts
+index 85c85697971f08cd74cbb0fd9b305ee844a0519e..5d90c63f0cf8ab5d694467afc003c7e83ed8e64b 100644
+--- a/dist/assetsUtil.d.ts
++++ b/dist/assetsUtil.d.ts
+@@ -53,7 +53,15 @@ export declare enum SupportedTokenDetectionNetworks {
+     arbitrum = "0xa4b1",
+     optimism = "0xa",
+     base = "0x2105",
+-    zksync = "0x144"
++    zksync = "0x144",
++    zksync = "0x144",
++    cronos = "0x19",
++    celo = "0xa4ec",
++    gnosis = "0x64",
++    fantom = "0xfa",
++    polygon_zkevm = "0x44d",
++    moonbeam = "0x504",
++    moonriver = "0x505"
+ }
+ /**
+  * Check if token detection is enabled for certain networks.
+diff --git a/dist/assetsUtil.js b/dist/assetsUtil.js
+index 27689263f0af453ac35c6f3240cc11e6b307458e..8d7098eff7080a4846c6b8c55650df102a6d8f2f 100644
+--- a/dist/assetsUtil.js
++++ b/dist/assetsUtil.js
+@@ -119,6 +119,13 @@ var SupportedTokenDetectionNetworks;
+     SupportedTokenDetectionNetworks["optimism"] = "0xa";
+     SupportedTokenDetectionNetworks["base"] = "0x2105";
+     SupportedTokenDetectionNetworks["zksync"] = "0x144";
++    SupportedTokenDetectionNetworks["cronos"] = "0x19";
++    SupportedTokenDetectionNetworks["celo"] = "0xa4ec";
++    SupportedTokenDetectionNetworks["gnosis"] = "0x64";
++    SupportedTokenDetectionNetworks["fantom"] = "0xfa";
++    SupportedTokenDetectionNetworks["polygon_zkevm"] = "0x44d";
++    SupportedTokenDetectionNetworks["moonbeam"] = "0x504";
++    SupportedTokenDetectionNetworks["moonriver"] = "0x505";
+ })(SupportedTokenDetectionNetworks = exports.SupportedTokenDetectionNetworks || (exports.SupportedTokenDetectionNetworks = {}));
+ /**
+  * Check if token detection is enabled for certain networks.
diff --git a/.yarn/patches/@metamask-controller-utils-patch-a87ddc3d4b.patch b/.yarn/patches/@metamask-controller-utils-patch-a87ddc3d4b.patch
new file mode 100644
index 000000000000..4d2e10d38361
--- /dev/null
+++ b/.yarn/patches/@metamask-controller-utils-patch-a87ddc3d4b.patch
@@ -0,0 +1,12 @@
+diff --git a/dist/types.js b/dist/types.js
+index c59368ae1b156162acec2aacb6d593c5122e9b09..012bb5197bbeaa5738b8144a540d3db8aa8cb85c 100644
+--- a/dist/types.js
++++ b/dist/types.js
+@@ -9,6 +9,7 @@ exports.InfuraNetworkType = {
+     goerli: 'goerli',
+     sepolia: 'sepolia',
+     'linea-goerli': 'linea-goerli',
++    "linea-sepolia": "linea-sepolia",
+     'linea-mainnet': 'linea-mainnet',
+ };
+ /**
diff --git a/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch b/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch
deleted file mode 100644
index fa91530b9cce..000000000000
--- a/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch
+++ /dev/null
@@ -1,1665 +0,0 @@
-diff --git a/PATCH.txt b/PATCH.txt
-new file mode 100644
-index 0000000000000000000000000000000000000000..990650b52e8bad8a30a9ae51d5a9e0fd5704cd8c
---- /dev/null
-+++ b/PATCH.txt
-@@ -0,0 +1,7 @@
-+============= PATCH NOTES ================
-+This patch is to ensure `state.gasFeeEstimates` always reflects the gas estiomtes
-+for the globally selected chain.
-+
-+Core PR: https://github.com/MetaMask/core/pull/4214/files
-+
-+Patch available on core branch `extension-gas-fee-controller-14.0.1-patch`
-diff --git a/dist/GasFeeController.js b/dist/GasFeeController.js
-index 96938dadea567b0e37e3fcf1ca957724429ff044..ae29d8b953c95871ea3ea0ec95aeaeed283ffd0e 100644
---- a/dist/GasFeeController.js
-+++ b/dist/GasFeeController.js
-@@ -3,7 +3,7 @@
- 
- 
- 
--var _chunkN5BANBTWjs = require('./chunk-N5BANBTW.js');
-+var _chunkIBADKXI6js = require('./chunk-IBADKXI6.js');
- require('./chunk-EZVGDV5H.js');
- require('./chunk-5INBFZXY.js');
- require('./chunk-F46NZXRQ.js');
-@@ -16,5 +16,5 @@ require('./chunk-Z4BLTVTB.js');
- 
- 
- 
--exports.GAS_ESTIMATE_TYPES = _chunkN5BANBTWjs.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkN5BANBTWjs.GasFeeController; exports.LEGACY_GAS_PRICES_API_URL = _chunkN5BANBTWjs.LEGACY_GAS_PRICES_API_URL; exports.default = _chunkN5BANBTWjs.GasFeeController_default;
-+exports.GAS_ESTIMATE_TYPES = _chunkIBADKXI6js.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkIBADKXI6js.GasFeeController; exports.LEGACY_GAS_PRICES_API_URL = _chunkIBADKXI6js.LEGACY_GAS_PRICES_API_URL; exports.default = _chunkIBADKXI6js.GasFeeController_default;
- //# sourceMappingURL=GasFeeController.js.map
-\ No newline at end of file
-diff --git a/dist/GasFeeController.mjs b/dist/GasFeeController.mjs
-index 3e9cd997b462360cf221132b947fd38575579c64..061377459d0ddd218bded9ba2ce3318419a522cd 100644
---- a/dist/GasFeeController.mjs
-+++ b/dist/GasFeeController.mjs
-@@ -3,7 +3,7 @@ import {
-   GasFeeController,
-   GasFeeController_default,
-   LEGACY_GAS_PRICES_API_URL
--} from "./chunk-4T54ULFA.mjs";
-+} from "./chunk-L45HVISM.mjs";
- import "./chunk-EXCWMMNV.mjs";
- import "./chunk-AQN4AQEF.mjs";
- import "./chunk-CCRUODGE.mjs";
-diff --git a/dist/chunk-4T54ULFA.mjs b/dist/chunk-4T54ULFA.mjs
-deleted file mode 100644
-index 049ff5858719fd487665c5705ca815d99a21c10d..0000000000000000000000000000000000000000
---- a/dist/chunk-4T54ULFA.mjs
-+++ /dev/null
-@@ -1,367 +0,0 @@
--import {
--  fetchGasEstimatesViaEthFeeHistory
--} from "./chunk-EXCWMMNV.mjs";
--import {
--  calculateTimeEstimate,
--  fetchEthGasPriceEstimate,
--  fetchGasEstimates,
--  fetchLegacyGasPriceEstimates
--} from "./chunk-CCRUODGE.mjs";
--import {
--  __privateAdd,
--  __privateGet,
--  __privateMethod,
--  __privateSet
--} from "./chunk-XUI43LEZ.mjs";
--
--// src/GasFeeController.ts
--import {
--  convertHexToDecimal,
--  safelyExecute,
--  toHex
--} from "@metamask/controller-utils";
--import EthQuery from "@metamask/eth-query";
--import { StaticIntervalPollingController } from "@metamask/polling-controller";
--import { v1 as random } from "uuid";
--var LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;
--var GAS_ESTIMATE_TYPES = {
--  FEE_MARKET: "fee-market",
--  LEGACY: "legacy",
--  ETH_GASPRICE: "eth_gasPrice",
--  NONE: "none"
--};
--var metadata = {
--  gasFeeEstimatesByChainId: {
--    persist: true,
--    anonymous: false
--  },
--  gasFeeEstimates: { persist: true, anonymous: false },
--  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
--  gasEstimateType: { persist: true, anonymous: false }
--};
--var name = "GasFeeController";
--var defaultState = {
--  gasFeeEstimatesByChainId: {},
--  gasFeeEstimates: {},
--  estimatedGasFeeTimeBounds: {},
--  gasEstimateType: GAS_ESTIMATE_TYPES.NONE
--};
--var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
--var GasFeeController = class extends StaticIntervalPollingController {
--  /**
--   * Creates a GasFeeController instance.
--   *
--   * @param options - The controller options.
--   * @param options.interval - The time in milliseconds to wait between polls.
--   * @param options.messenger - The controller messenger.
--   * @param options.state - The initial state.
--   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
--   * network is EIP-1559 compatible.
--   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
--   * current network is compatible with the legacy gas price API.
--   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
--   * account is EIP-1559 compatible.
--   * @param options.getChainId - Returns the current chain ID.
--   * @param options.getProvider - Returns a network provider for the current network.
--   * @param options.onNetworkDidChange - A function for registering an event handler for the
--   * network state change event.
--   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for
--   * testing purposes.
--   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.
--   * @param options.clientId - The client ID used to identify to the gas estimation API who is
--   * asking for estimates.
--   */
--  constructor({
--    interval = 15e3,
--    messenger,
--    state,
--    getCurrentNetworkEIP1559Compatibility,
--    getCurrentAccountEIP1559Compatibility,
--    getChainId,
--    getCurrentNetworkLegacyGasAPICompatibility,
--    getProvider,
--    onNetworkDidChange,
--    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,
--    EIP1559APIEndpoint,
--    clientId
--  }) {
--    super({
--      name,
--      metadata,
--      messenger,
--      state: { ...defaultState, ...state }
--    });
--    __privateAdd(this, _onNetworkControllerDidChange);
--    __privateAdd(this, _getProvider, void 0);
--    this.intervalDelay = interval;
--    this.setIntervalLength(interval);
--    this.pollTokens = /* @__PURE__ */ new Set();
--    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
--    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
--    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
--    __privateSet(this, _getProvider, getProvider);
--    this.EIP1559APIEndpoint = EIP1559APIEndpoint;
--    this.legacyAPIEndpoint = legacyAPIEndpoint;
--    this.clientId = clientId;
--    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
--    if (onNetworkDidChange && getChainId) {
--      this.currentChainId = getChainId();
--      onNetworkDidChange(async (networkControllerState) => {
--        await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
--      });
--    } else {
--      this.currentChainId = this.messagingSystem.call(
--        "NetworkController:getState"
--      ).providerConfig.chainId;
--      this.messagingSystem.subscribe(
--        "NetworkController:networkDidChange",
--        async (networkControllerState) => {
--          await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
--        }
--      );
--    }
--  }
--  async resetPolling() {
--    if (this.pollTokens.size !== 0) {
--      const tokens = Array.from(this.pollTokens);
--      this.stopPolling();
--      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
--      tokens.slice(1).forEach((token) => {
--        this.pollTokens.add(token);
--      });
--    }
--  }
--  async fetchGasFeeEstimates(options) {
--    return await this._fetchGasFeeEstimateData(options);
--  }
--  async getGasFeeEstimatesAndStartPolling(pollToken) {
--    const _pollToken = pollToken || random();
--    this.pollTokens.add(_pollToken);
--    if (this.pollTokens.size === 1) {
--      await this._fetchGasFeeEstimateData();
--      this._poll();
--    }
--    return _pollToken;
--  }
--  /**
--   * Gets and sets gasFeeEstimates in state.
--   *
--   * @param options - The gas fee estimate options.
--   * @param options.shouldUpdateState - Determines whether the state should be updated with the
--   * updated gas estimates.
--   * @returns The gas fee estimates.
--   */
--  async _fetchGasFeeEstimateData(options = {}) {
--    const { shouldUpdateState = true, networkClientId } = options;
--    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
--    if (networkClientId !== void 0) {
--      const networkClient = this.messagingSystem.call(
--        "NetworkController:getNetworkClientById",
--        networkClientId
--      );
--      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
--      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);
--      try {
--        const result = await this.messagingSystem.call(
--          "NetworkController:getEIP1559Compatibility",
--          networkClientId
--        );
--        isEIP1559Compatible = result || false;
--      } catch {
--        isEIP1559Compatible = false;
--      }
--      ethQuery = new EthQuery(networkClient.provider);
--    }
--    ethQuery ?? (ethQuery = this.ethQuery);
--    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
--    decimalChainId ?? (decimalChainId = convertHexToDecimal(this.currentChainId));
--    try {
--      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
--    } catch (e) {
--      console.error(e);
--      isEIP1559Compatible ?? (isEIP1559Compatible = false);
--    }
--    const gasFeeCalculations = await determineGasFeeCalculations({
--      isEIP1559Compatible,
--      isLegacyGasAPICompatible,
--      fetchGasEstimates,
--      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
--        "<chain_id>",
--        `${decimalChainId}`
--      ),
--      fetchGasEstimatesViaEthFeeHistory,
--      fetchLegacyGasPriceEstimates,
--      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
--        "<chain_id>",
--        `${decimalChainId}`
--      ),
--      fetchEthGasPriceEstimate,
--      calculateTimeEstimate,
--      clientId: this.clientId,
--      ethQuery
--    });
--    if (shouldUpdateState) {
--      this.update((state) => {
--        state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
--        state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
--        state.gasEstimateType = gasFeeCalculations.gasEstimateType;
--        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
--        state.gasFeeEstimatesByChainId[toHex(decimalChainId)] = {
--          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
--          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
--          gasEstimateType: gasFeeCalculations.gasEstimateType
--        };
--      });
--    }
--    return gasFeeCalculations;
--  }
--  /**
--   * Remove the poll token, and stop polling if the set of poll tokens is empty.
--   *
--   * @param pollToken - The poll token to disconnect.
--   */
--  disconnectPoller(pollToken) {
--    this.pollTokens.delete(pollToken);
--    if (this.pollTokens.size === 0) {
--      this.stopPolling();
--    }
--  }
--  stopPolling() {
--    if (this.intervalId) {
--      clearInterval(this.intervalId);
--    }
--    this.pollTokens.clear();
--    this.resetState();
--  }
--  /**
--   * Prepare to discard this controller.
--   *
--   * This stops any active polling.
--   */
--  destroy() {
--    super.destroy();
--    this.stopPolling();
--  }
--  _poll() {
--    if (this.intervalId) {
--      clearInterval(this.intervalId);
--    }
--    this.intervalId = setInterval(async () => {
--      await safelyExecute(() => this._fetchGasFeeEstimateData());
--    }, this.intervalDelay);
--  }
--  /**
--   * Fetching token list from the Token Service API.
--   *
--   * @private
--   * @param networkClientId - The ID of the network client triggering the fetch.
--   * @returns A promise that resolves when this operation completes.
--   */
--  async _executePoll(networkClientId) {
--    await this._fetchGasFeeEstimateData({ networkClientId });
--  }
--  resetState() {
--    this.update(() => {
--      return defaultState;
--    });
--  }
--  async getEIP1559Compatibility() {
--    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
--    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
--    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
--  }
--  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
--    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
--      return {};
--    }
--    return calculateTimeEstimate(
--      maxPriorityFeePerGas,
--      maxFeePerGas,
--      this.state.gasFeeEstimates
--    );
--  }
--};
--_getProvider = new WeakMap();
--_onNetworkControllerDidChange = new WeakSet();
--onNetworkControllerDidChange_fn = async function(networkControllerState) {
--  const newChainId = networkControllerState.providerConfig.chainId;
--  if (newChainId !== this.currentChainId) {
--    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
--    await this.resetPolling();
--    this.currentChainId = newChainId;
--  }
--};
--var GasFeeController_default = GasFeeController;
--
--// src/determineGasFeeCalculations.ts
--async function determineGasFeeCalculations({
--  isEIP1559Compatible,
--  isLegacyGasAPICompatible,
--  fetchGasEstimates: fetchGasEstimates2,
--  fetchGasEstimatesUrl,
--  fetchGasEstimatesViaEthFeeHistory: fetchGasEstimatesViaEthFeeHistory2,
--  fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
--  fetchLegacyGasPriceEstimatesUrl,
--  fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2,
--  calculateTimeEstimate: calculateTimeEstimate2,
--  clientId,
--  ethQuery
--}) {
--  try {
--    if (isEIP1559Compatible) {
--      let estimates;
--      try {
--        estimates = await fetchGasEstimates2(fetchGasEstimatesUrl, clientId);
--      } catch {
--        estimates = await fetchGasEstimatesViaEthFeeHistory2(ethQuery);
--      }
--      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
--      const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
--        suggestedMaxPriorityFeePerGas,
--        suggestedMaxFeePerGas,
--        estimates
--      );
--      return {
--        gasFeeEstimates: estimates,
--        estimatedGasFeeTimeBounds,
--        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
--      };
--    } else if (isLegacyGasAPICompatible) {
--      const estimates = await fetchLegacyGasPriceEstimates2(
--        fetchLegacyGasPriceEstimatesUrl,
--        clientId
--      );
--      return {
--        gasFeeEstimates: estimates,
--        estimatedGasFeeTimeBounds: {},
--        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
--      };
--    }
--    throw new Error("Main gas fee/price estimation failed. Use fallback");
--  } catch {
--    try {
--      const estimates = await fetchEthGasPriceEstimate2(ethQuery);
--      return {
--        gasFeeEstimates: estimates,
--        estimatedGasFeeTimeBounds: {},
--        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
--      };
--    } catch (error) {
--      if (error instanceof Error) {
--        throw new Error(
--          `Gas fee/price estimation failed. Message: ${error.message}`
--        );
--      }
--      throw error;
--    }
--  }
--}
--
--export {
--  determineGasFeeCalculations,
--  LEGACY_GAS_PRICES_API_URL,
--  GAS_ESTIMATE_TYPES,
--  GasFeeController,
--  GasFeeController_default
--};
--//# sourceMappingURL=chunk-4T54ULFA.mjs.map
-\ No newline at end of file
-diff --git a/dist/chunk-4T54ULFA.mjs.map b/dist/chunk-4T54ULFA.mjs.map
-deleted file mode 100644
-index afa8fb46c485be85d49f57b63ff8211979da31e4..0000000000000000000000000000000000000000
---- a/dist/chunk-4T54ULFA.mjs.map
-+++ /dev/null
-@@ -1 +0,0 @@
--{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport fetchGasEstimatesViaEthFeeHistory from './fetchGasEstimatesViaEthFeeHistory';\nimport {\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n} from './gas-util';\n\nexport const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId & SingleChainGasFeeState;\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for\n   * testing purposes.\n   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,\n    EIP1559APIEndpoint,\n    clientId,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    legacyAPIEndpoint?: string;\n    EIP1559APIEndpoint: string;\n    clientId?: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = EIP1559APIEndpoint;\n    this.legacyAPIEndpoint = legacyAPIEndpoint;\n    this.clientId = clientId;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchGasEstimatesViaEthFeeHistory,\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n    });\n\n    if (shouldUpdateState) {\n      this.update((state) => {\n        state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n        state.estimatedGasFeeTimeBounds =\n          gasFeeCalculations.estimatedGasFeeTimeBounds;\n        state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[toHex(decimalChainId)] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchGasEstimatesViaEthFeeHistory - A function that fetches gas estimates using\n * `eth_feeHistory` (an EIP-1559 feature).\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations({\n  isEIP1559Compatible,\n  isLegacyGasAPICompatible,\n  fetchGasEstimates,\n  fetchGasEstimatesUrl,\n  fetchGasEstimatesViaEthFeeHistory,\n  fetchLegacyGasPriceEstimates,\n  fetchLegacyGasPriceEstimatesUrl,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n  clientId,\n  ethQuery,\n}: {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchGasEstimatesViaEthFeeHistory: (\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    ethQuery: any,\n  ) => Promise<GasFeeEstimates>;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n}): Promise<GasFeeCalculations> {\n  try {\n    if (isEIP1559Compatible) {\n      let estimates: GasFeeEstimates;\n      try {\n        estimates = await fetchGasEstimates(fetchGasEstimatesUrl, clientId);\n      } catch {\n        estimates = await fetchGasEstimatesViaEthFeeHistory(ethQuery);\n      }\n      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n        estimates.medium;\n      const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n        suggestedMaxPriorityFeePerGas,\n        suggestedMaxFeePerGas,\n        estimates,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds,\n        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n      };\n    } else if (isLegacyGasAPICompatible) {\n      const estimates = await fetchLegacyGasPriceEstimates(\n        fetchLegacyGasPriceEstimatesUrl,\n        clientId,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n      };\n    }\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    try {\n      const estimates = await fetchEthGasPriceEstimate(ethQuery);\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n      };\n    } catch (error) {\n      if (error instanceof Error) {\n        throw new Error(\n          `Gas fee/price estimation failed. Message: ${error.message}`,\n        );\n      }\n      throw error;\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAKA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,OAAO,cAAc;AAUrB,SAAS,uCAAuC;AAEhD,SAAS,MAAM,cAAc;AAWtB,IAAM,4BAA4B;AA0BlC,IAAM,qBAAqB;AAAA,EAChC,YAAY;AAAA,EACZ,QAAQ;AAAA,EACR,cAAc;AAAA,EACd,MAAM;AACR;AAiGA,IAAM,WAAW;AAAA,EACf,0BAA0B;AAAA,IACxB,SAAS;AAAA,IACT,WAAW;AAAA,EACb;AAAA,EACA,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EACnD,2BAA2B,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EAC7D,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AACrD;AAkDA,IAAM,OAAO;AA0Bb,IAAM,eAA4B;AAAA,EAChC,0BAA0B,CAAC;AAAA,EAC3B,iBAAiB,CAAC;AAAA,EAClB,2BAA2B,CAAC;AAAA,EAC5B,iBAAiB,mBAAmB;AACtC;AA1PA;AA+PO,IAAM,mBAAN,cAA+B,gCAIpC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAgDA,YAAY;AAAA,IACV,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,EACF,GAaG;AACD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,EAAE,GAAG,cAAc,GAAG,MAAM;AAAA,IACrC,CAAC;AAkPH,uBAAM;AA3SN;AA0DE,SAAK,gBAAgB;AACrB,SAAK,kBAAkB,QAAQ;AAC/B,SAAK,aAAa,oBAAI,IAAI;AAC1B,SAAK,wCACH;AACF,SAAK,6CACH;AACF,SAAK,wCACH;AACF,uBAAK,cAAe;AACpB,SAAK,qBAAqB;AAC1B,SAAK,oBAAoB;AACzB,SAAK,WAAW;AAEhB,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAEhD,QAAI,sBAAsB,YAAY;AACpC,WAAK,iBAAiB,WAAW;AACjC,yBAAmB,OAAO,2BAA2B;AACnD,cAAM,sBAAK,gEAAL,WAAmC;AAAA,MAC3C,CAAC;AAAA,IACH,OAAO;AACL,WAAK,iBAAiB,KAAK,gBAAgB;AAAA,QACzC;AAAA,MACF,EAAE,eAAe;AACjB,WAAK,gBAAgB;AAAA,QACnB;AAAA,QACA,OAAO,2BAA2B;AAChC,gBAAM,sBAAK,gEAAL,WAAmC;AAAA,QAC3C;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,eAAe;AACnB,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,SAAS,MAAM,KAAK,KAAK,UAAU;AACzC,WAAK,YAAY;AACjB,YAAM,KAAK,kCAAkC,OAAO,CAAC,CAAC;AACtD,aAAO,MAAM,CAAC,EAAE,QAAQ,CAAC,UAAU;AACjC,aAAK,WAAW,IAAI,KAAK;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,MAAM,qBAAqB,SAAsC;AAC/D,WAAO,MAAM,KAAK,yBAAyB,OAAO;AAAA,EACpD;AAAA,EAEA,MAAM,kCACJ,WACiB;AACjB,UAAM,aAAa,aAAa,OAAO;AAEvC,SAAK,WAAW,IAAI,UAAU;AAE9B,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,KAAK,yBAAyB;AACpC,WAAK,MAAM;AAAA,IACb;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAM,yBACJ,UAAsC,CAAC,GACjB;AACtB,UAAM,EAAE,oBAAoB,MAAM,gBAAgB,IAAI;AAEtD,QAAI,UACF,qBACA,0BACA;AAEF,QAAI,oBAAoB,QAAW;AACjC,YAAM,gBAAgB,KAAK,gBAAgB;AAAA,QACzC;AAAA,QACA;AAAA,MACF;AACA,iCAA2B,cAAc,cAAc,YAAY;AAEnE,uBAAiB,oBAAoB,cAAc,cAAc,OAAO;AAExE,UAAI;AACF,cAAM,SAAS,MAAM,KAAK,gBAAgB;AAAA,UACxC;AAAA,UACA;AAAA,QACF;AACA,8BAAsB,UAAU;AAAA,MAClC,QAAQ;AACN,8BAAsB;AAAA,MACxB;AACA,iBAAW,IAAI,SAAS,cAAc,QAAQ;AAAA,IAChD;AAEA,4BAAa,KAAK;AAElB,4DACE,KAAK,2CAA2C;AAElD,wCAAmB,oBAAoB,KAAK,cAAc;AAE1D,QAAI;AACF,oDAAwB,MAAM,KAAK,wBAAwB;AAAA,IAC7D,SAAS,GAAG;AACV,cAAQ,MAAM,CAAC;AACf,oDAAwB;AAAA,IAC1B;AAEA,UAAM,qBAAqB,MAAM,4BAA4B;AAAA,MAC3D;AAAA,MACA;AAAA,MACA;AAAA,MACA,sBAAsB,KAAK,mBAAmB;AAAA,QAC5C;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,iCAAiC,KAAK,kBAAkB;AAAA,QACtD;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,UAAU,KAAK;AAAA,MACf;AAAA,IACF,CAAC;AAED,QAAI,mBAAmB;AACrB,WAAK,OAAO,CAAC,UAAU;AACrB,cAAM,kBAAkB,mBAAmB;AAC3C,cAAM,4BACJ,mBAAmB;AACrB,cAAM,kBAAkB,mBAAmB;AAC3C,cAAM,6BAAN,MAAM,2BAA6B,CAAC;AACpC,cAAM,yBAAyB,MAAM,cAAc,CAAC,IAAI;AAAA,UACtD,iBAAiB,mBAAmB;AAAA,UACpC,2BACE,mBAAmB;AAAA,UACrB,iBAAiB,mBAAmB;AAAA,QACtC;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,iBAAiB,WAAmB;AAClC,SAAK,WAAW,OAAO,SAAS;AAChC,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,WAAK,YAAY;AAAA,IACnB;AAAA,EACF;AAAA,EAEA,cAAc;AACZ,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AACA,SAAK,WAAW,MAAM;AACtB,SAAK,WAAW;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOS,UAAU;AACjB,UAAM,QAAQ;AACd,SAAK,YAAY;AAAA,EACnB;AAAA,EAEQ,QAAQ;AACd,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AAEA,SAAK,aAAa,YAAY,YAAY;AACxC,YAAM,cAAc,MAAM,KAAK,yBAAyB,CAAC;AAAA,IAC3D,GAAG,KAAK,aAAa;AAAA,EACvB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,aAAa,iBAAwC;AACzD,UAAM,KAAK,yBAAyB,EAAE,gBAAgB,CAAC;AAAA,EACzD;AAAA,EAEQ,aAAa;AACnB,SAAK,OAAO,MAAM;AAChB,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA,EAEA,MAAc,0BAA0B;AACtC,UAAM,oCACJ,MAAM,KAAK,sCAAsC;AACnD,UAAM,oCACJ,KAAK,wCAAwC,KAAK;AAEpD,WACE,qCAAqC;AAAA,EAEzC;AAAA,EAEA,gBACE,sBACA,cACmD;AACnD,QACE,CAAC,KAAK,MAAM,mBACZ,KAAK,MAAM,oBAAoB,mBAAmB,YAClD;AACA,aAAO,CAAC;AAAA,IACV;AACA,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK,MAAM;AAAA,IACb;AAAA,EACF;AAYF;AArTE;AA2SM;AAAA,kCAA6B,eAAC,wBAAsC;AACxE,QAAM,aAAa,uBAAuB,eAAe;AAEzD,MAAI,eAAe,KAAK,gBAAgB;AACtC,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAChD,UAAM,KAAK,aAAa;AAExB,SAAK,iBAAiB;AAAA,EACxB;AACF;AAGF,IAAO,2BAAQ;;;AC9iBf,eAAO,4BAAmD;AAAA,EACxD;AAAA,EACA;AAAA,EACA,mBAAAA;AAAA,EACA;AAAA,EACA,mCAAAC;AAAA,EACA,8BAAAC;AAAA,EACA;AAAA,EACA,0BAAAC;AAAA,EACA,uBAAAC;AAAA,EACA;AAAA,EACA;AACF,GA8BgC;AAC9B,MAAI;AACF,QAAI,qBAAqB;AACvB,UAAI;AACJ,UAAI;AACF,oBAAY,MAAMJ,mBAAkB,sBAAsB,QAAQ;AAAA,MACpE,QAAQ;AACN,oBAAY,MAAMC,mCAAkC,QAAQ;AAAA,MAC9D;AACA,YAAM,EAAE,+BAA+B,sBAAsB,IAC3D,UAAU;AACZ,YAAM,4BAA4BG;AAAA,QAChC;AAAA,QACA;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB;AAAA,QACA,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,WAAW,0BAA0B;AACnC,YAAM,YAAY,MAAMF;AAAA,QACtB;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF;AACA,UAAM,IAAI,MAAM,oDAAoD;AAAA,EACtE,QAAQ;AACN,QAAI;AACF,YAAM,YAAY,MAAMC,0BAAyB,QAAQ;AACzD,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,SAAS,OAAO;AACd,UAAI,iBAAiB,OAAO;AAC1B,cAAM,IAAI;AAAA,UACR,6CAA6C,MAAM,OAAO;AAAA,QAC5D;AAAA,MACF;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF;","names":["fetchGasEstimates","fetchGasEstimatesViaEthFeeHistory","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate","calculateTimeEstimate"]}
-\ No newline at end of file
-diff --git a/dist/chunk-IBADKXI6.js b/dist/chunk-IBADKXI6.js
-new file mode 100644
-index 0000000000000000000000000000000000000000..d69fcfd95d4e2de007c82ab6743ca18a2af45a76
---- /dev/null
-+++ b/dist/chunk-IBADKXI6.js
-@@ -0,0 +1,370 @@
-+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-+
-+var _chunkEZVGDV5Hjs = require('./chunk-EZVGDV5H.js');
-+
-+
-+
-+
-+
-+var _chunkF46NZXRQjs = require('./chunk-F46NZXRQ.js');
-+
-+
-+
-+
-+
-+var _chunkZ4BLTVTBjs = require('./chunk-Z4BLTVTB.js');
-+
-+// src/GasFeeController.ts
-+
-+
-+
-+
-+var _controllerutils = require('@metamask/controller-utils');
-+var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
-+var _pollingcontroller = require('@metamask/polling-controller');
-+var _uuid = require('uuid');
-+var LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;
-+var GAS_ESTIMATE_TYPES = {
-+  FEE_MARKET: "fee-market",
-+  LEGACY: "legacy",
-+  ETH_GASPRICE: "eth_gasPrice",
-+  NONE: "none"
-+};
-+var metadata = {
-+  gasFeeEstimatesByChainId: {
-+    persist: true,
-+    anonymous: false
-+  },
-+  gasFeeEstimates: { persist: true, anonymous: false },
-+  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
-+  gasEstimateType: { persist: true, anonymous: false }
-+};
-+var name = "GasFeeController";
-+var defaultState = {
-+  gasFeeEstimatesByChainId: {},
-+  gasFeeEstimates: {},
-+  estimatedGasFeeTimeBounds: {},
-+  gasEstimateType: GAS_ESTIMATE_TYPES.NONE
-+};
-+var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
-+var GasFeeController = class extends _pollingcontroller.StaticIntervalPollingController {
-+  /**
-+   * Creates a GasFeeController instance.
-+   *
-+   * @param options - The controller options.
-+   * @param options.interval - The time in milliseconds to wait between polls.
-+   * @param options.messenger - The controller messenger.
-+   * @param options.state - The initial state.
-+   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
-+   * network is EIP-1559 compatible.
-+   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
-+   * current network is compatible with the legacy gas price API.
-+   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
-+   * account is EIP-1559 compatible.
-+   * @param options.getChainId - Returns the current chain ID.
-+   * @param options.getProvider - Returns a network provider for the current network.
-+   * @param options.onNetworkDidChange - A function for registering an event handler for the
-+   * network state change event.
-+   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for
-+   * testing purposes.
-+   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.
-+   * @param options.clientId - The client ID used to identify to the gas estimation API who is
-+   * asking for estimates.
-+   */
-+  constructor({
-+    interval = 15e3,
-+    messenger,
-+    state,
-+    getCurrentNetworkEIP1559Compatibility,
-+    getCurrentAccountEIP1559Compatibility,
-+    getChainId,
-+    getCurrentNetworkLegacyGasAPICompatibility,
-+    getProvider,
-+    onNetworkDidChange,
-+    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,
-+    EIP1559APIEndpoint,
-+    clientId
-+  }) {
-+    super({
-+      name,
-+      metadata,
-+      messenger,
-+      state: { ...defaultState, ...state }
-+    });
-+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _onNetworkControllerDidChange);
-+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getProvider, void 0);
-+    this.intervalDelay = interval;
-+    this.setIntervalLength(interval);
-+    this.pollTokens = /* @__PURE__ */ new Set();
-+    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
-+    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
-+    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
-+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _getProvider, getProvider);
-+    this.EIP1559APIEndpoint = EIP1559APIEndpoint;
-+    this.legacyAPIEndpoint = legacyAPIEndpoint;
-+    this.clientId = clientId;
-+    this.ethQuery = new (0, _ethquery2.default)(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _getProvider).call(this));
-+    if (onNetworkDidChange && getChainId) {
-+      this.currentChainId = getChainId();
-+      onNetworkDidChange(async (networkControllerState) => {
-+        await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
-+      });
-+    } else {
-+      this.currentChainId = this.messagingSystem.call(
-+        "NetworkController:getState"
-+      ).providerConfig.chainId;
-+      this.messagingSystem.subscribe(
-+        "NetworkController:networkDidChange",
-+        async (networkControllerState) => {
-+          await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
-+        }
-+      );
-+    }
-+  }
-+  async resetPolling() {
-+    if (this.pollTokens.size !== 0) {
-+      const tokens = Array.from(this.pollTokens);
-+      this.stopPolling();
-+      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
-+      tokens.slice(1).forEach((token) => {
-+        this.pollTokens.add(token);
-+      });
-+    }
-+  }
-+  async fetchGasFeeEstimates(options) {
-+    return await this._fetchGasFeeEstimateData(options);
-+  }
-+  async getGasFeeEstimatesAndStartPolling(pollToken) {
-+    const _pollToken = pollToken || _uuid.v1.call(void 0, );
-+    this.pollTokens.add(_pollToken);
-+    if (this.pollTokens.size === 1) {
-+      await this._fetchGasFeeEstimateData();
-+      this._poll();
-+    }
-+    return _pollToken;
-+  }
-+  /**
-+   * Gets and sets gasFeeEstimates in state.
-+   *
-+   * @param options - The gas fee estimate options.
-+   * @param options.shouldUpdateState - Determines whether the state should be updated with the
-+   * updated gas estimates.
-+   * @returns The gas fee estimates.
-+   */
-+  async _fetchGasFeeEstimateData(options = {}) {
-+    const { shouldUpdateState = true, networkClientId } = options;
-+    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
-+    if (networkClientId !== void 0) {
-+      const networkClient = this.messagingSystem.call(
-+        "NetworkController:getNetworkClientById",
-+        networkClientId
-+      );
-+      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
-+      decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, networkClient.configuration.chainId);
-+      try {
-+        const result = await this.messagingSystem.call(
-+          "NetworkController:getEIP1559Compatibility",
-+          networkClientId
-+        );
-+        isEIP1559Compatible = result || false;
-+      } catch {
-+        isEIP1559Compatible = false;
-+      }
-+      ethQuery = new (0, _ethquery2.default)(networkClient.provider);
-+    }
-+    ethQuery ?? (ethQuery = this.ethQuery);
-+    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
-+    decimalChainId ?? (decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, this.currentChainId));
-+    try {
-+      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
-+    } catch (e) {
-+      console.error(e);
-+      isEIP1559Compatible ?? (isEIP1559Compatible = false);
-+    }
-+    const gasFeeCalculations = await determineGasFeeCalculations({
-+      isEIP1559Compatible,
-+      isLegacyGasAPICompatible,
-+      fetchGasEstimates: _chunkF46NZXRQjs.fetchGasEstimates,
-+      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
-+        "<chain_id>",
-+        `${decimalChainId}`
-+      ),
-+      fetchGasEstimatesViaEthFeeHistory: _chunkEZVGDV5Hjs.fetchGasEstimatesViaEthFeeHistory,
-+      fetchLegacyGasPriceEstimates: _chunkF46NZXRQjs.fetchLegacyGasPriceEstimates,
-+      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
-+        "<chain_id>",
-+        `${decimalChainId}`
-+      ),
-+      fetchEthGasPriceEstimate: _chunkF46NZXRQjs.fetchEthGasPriceEstimate,
-+      calculateTimeEstimate: _chunkF46NZXRQjs.calculateTimeEstimate,
-+      clientId: this.clientId,
-+      ethQuery
-+    });
-+    if (shouldUpdateState) {
-+      const chainId = _controllerutils.toHex.call(void 0, decimalChainId);
-+      this.update((state) => {
-+        if (this.currentChainId === chainId) {
-+          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
-+          state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
-+          state.gasEstimateType = gasFeeCalculations.gasEstimateType;
-+        }
-+        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
-+        state.gasFeeEstimatesByChainId[chainId] = {
-+          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
-+          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
-+          gasEstimateType: gasFeeCalculations.gasEstimateType
-+        };
-+      });
-+    }
-+    return gasFeeCalculations;
-+  }
-+  /**
-+   * Remove the poll token, and stop polling if the set of poll tokens is empty.
-+   *
-+   * @param pollToken - The poll token to disconnect.
-+   */
-+  disconnectPoller(pollToken) {
-+    this.pollTokens.delete(pollToken);
-+    if (this.pollTokens.size === 0) {
-+      this.stopPolling();
-+    }
-+  }
-+  stopPolling() {
-+    if (this.intervalId) {
-+      clearInterval(this.intervalId);
-+    }
-+    this.pollTokens.clear();
-+    this.resetState();
-+  }
-+  /**
-+   * Prepare to discard this controller.
-+   *
-+   * This stops any active polling.
-+   */
-+  destroy() {
-+    super.destroy();
-+    this.stopPolling();
-+  }
-+  _poll() {
-+    if (this.intervalId) {
-+      clearInterval(this.intervalId);
-+    }
-+    this.intervalId = setInterval(async () => {
-+      await _controllerutils.safelyExecute.call(void 0, () => this._fetchGasFeeEstimateData());
-+    }, this.intervalDelay);
-+  }
-+  /**
-+   * Fetching token list from the Token Service API.
-+   *
-+   * @private
-+   * @param networkClientId - The ID of the network client triggering the fetch.
-+   * @returns A promise that resolves when this operation completes.
-+   */
-+  async _executePoll(networkClientId) {
-+    await this._fetchGasFeeEstimateData({ networkClientId });
-+  }
-+  resetState() {
-+    this.update(() => {
-+      return defaultState;
-+    });
-+  }
-+  async getEIP1559Compatibility() {
-+    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
-+    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
-+    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
-+  }
-+  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
-+    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
-+      return {};
-+    }
-+    return _chunkF46NZXRQjs.calculateTimeEstimate.call(void 0, 
-+      maxPriorityFeePerGas,
-+      maxFeePerGas,
-+      this.state.gasFeeEstimates
-+    );
-+  }
-+};
-+_getProvider = new WeakMap();
-+_onNetworkControllerDidChange = new WeakSet();
-+onNetworkControllerDidChange_fn = async function(networkControllerState) {
-+  const newChainId = networkControllerState.providerConfig.chainId;
-+  if (newChainId !== this.currentChainId) {
-+    this.ethQuery = new (0, _ethquery2.default)(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _getProvider).call(this));
-+    await this.resetPolling();
-+    this.currentChainId = newChainId;
-+  }
-+};
-+var GasFeeController_default = GasFeeController;
-+
-+// src/determineGasFeeCalculations.ts
-+async function determineGasFeeCalculations({
-+  isEIP1559Compatible,
-+  isLegacyGasAPICompatible,
-+  fetchGasEstimates: fetchGasEstimates2,
-+  fetchGasEstimatesUrl,
-+  fetchGasEstimatesViaEthFeeHistory: fetchGasEstimatesViaEthFeeHistory2,
-+  fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
-+  fetchLegacyGasPriceEstimatesUrl,
-+  fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2,
-+  calculateTimeEstimate: calculateTimeEstimate2,
-+  clientId,
-+  ethQuery
-+}) {
-+  try {
-+    if (isEIP1559Compatible) {
-+      let estimates;
-+      try {
-+        estimates = await fetchGasEstimates2(fetchGasEstimatesUrl, clientId);
-+      } catch {
-+        estimates = await fetchGasEstimatesViaEthFeeHistory2(ethQuery);
-+      }
-+      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
-+      const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
-+        suggestedMaxPriorityFeePerGas,
-+        suggestedMaxFeePerGas,
-+        estimates
-+      );
-+      return {
-+        gasFeeEstimates: estimates,
-+        estimatedGasFeeTimeBounds,
-+        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
-+      };
-+    } else if (isLegacyGasAPICompatible) {
-+      const estimates = await fetchLegacyGasPriceEstimates2(
-+        fetchLegacyGasPriceEstimatesUrl,
-+        clientId
-+      );
-+      return {
-+        gasFeeEstimates: estimates,
-+        estimatedGasFeeTimeBounds: {},
-+        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
-+      };
-+    }
-+    throw new Error("Main gas fee/price estimation failed. Use fallback");
-+  } catch {
-+    try {
-+      const estimates = await fetchEthGasPriceEstimate2(ethQuery);
-+      return {
-+        gasFeeEstimates: estimates,
-+        estimatedGasFeeTimeBounds: {},
-+        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
-+      };
-+    } catch (error) {
-+      if (error instanceof Error) {
-+        throw new Error(
-+          `Gas fee/price estimation failed. Message: ${error.message}`
-+        );
-+      }
-+      throw error;
-+    }
-+  }
-+}
-+
-+
-+
-+
-+
-+
-+
-+exports.determineGasFeeCalculations = determineGasFeeCalculations; exports.LEGACY_GAS_PRICES_API_URL = LEGACY_GAS_PRICES_API_URL; exports.GAS_ESTIMATE_TYPES = GAS_ESTIMATE_TYPES; exports.GasFeeController = GasFeeController; exports.GasFeeController_default = GasFeeController_default;
-+//# sourceMappingURL=chunk-IBADKXI6.js.map
-\ No newline at end of file
-diff --git a/dist/chunk-IBADKXI6.js.map b/dist/chunk-IBADKXI6.js.map
-new file mode 100644
-index 0000000000000000000000000000000000000000..7d650730cb2225437c3dda8b0603243cd1586082
---- /dev/null
-+++ b/dist/chunk-IBADKXI6.js.map
-@@ -0,0 +1 @@
-+{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"names":["fetchGasEstimates","fetchGasEstimatesViaEthFeeHistory","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate","calculateTimeEstimate"],"mappings":";;;;;;;;;;;;;;;;;AAKA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,OAAO,cAAc;AAUrB,SAAS,uCAAuC;AAEhD,SAAS,MAAM,cAAc;AAWtB,IAAM,4BAA4B;AA0BlC,IAAM,qBAAqB;AAAA,EAChC,YAAY;AAAA,EACZ,QAAQ;AAAA,EACR,cAAc;AAAA,EACd,MAAM;AACR;AAiGA,IAAM,WAAW;AAAA,EACf,0BAA0B;AAAA,IACxB,SAAS;AAAA,IACT,WAAW;AAAA,EACb;AAAA,EACA,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EACnD,2BAA2B,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EAC7D,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AACrD;AAkDA,IAAM,OAAO;AA0Bb,IAAM,eAA4B;AAAA,EAChC,0BAA0B,CAAC;AAAA,EAC3B,iBAAiB,CAAC;AAAA,EAClB,2BAA2B,CAAC;AAAA,EAC5B,iBAAiB,mBAAmB;AACtC;AA1PA;AA+PO,IAAM,mBAAN,cAA+B,gCAIpC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAgDA,YAAY;AAAA,IACV,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,EACF,GAaG;AACD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,EAAE,GAAG,cAAc,GAAG,MAAM;AAAA,IACrC,CAAC;AAqPH,uBAAM;AA9SN;AA0DE,SAAK,gBAAgB;AACrB,SAAK,kBAAkB,QAAQ;AAC/B,SAAK,aAAa,oBAAI,IAAI;AAC1B,SAAK,wCACH;AACF,SAAK,6CACH;AACF,SAAK,wCACH;AACF,uBAAK,cAAe;AACpB,SAAK,qBAAqB;AAC1B,SAAK,oBAAoB;AACzB,SAAK,WAAW;AAEhB,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAEhD,QAAI,sBAAsB,YAAY;AACpC,WAAK,iBAAiB,WAAW;AACjC,yBAAmB,OAAO,2BAA2B;AACnD,cAAM,sBAAK,gEAAL,WAAmC;AAAA,MAC3C,CAAC;AAAA,IACH,OAAO;AACL,WAAK,iBAAiB,KAAK,gBAAgB;AAAA,QACzC;AAAA,MACF,EAAE,eAAe;AACjB,WAAK,gBAAgB;AAAA,QACnB;AAAA,QACA,OAAO,2BAA2B;AAChC,gBAAM,sBAAK,gEAAL,WAAmC;AAAA,QAC3C;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,eAAe;AACnB,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,SAAS,MAAM,KAAK,KAAK,UAAU;AACzC,WAAK,YAAY;AACjB,YAAM,KAAK,kCAAkC,OAAO,CAAC,CAAC;AACtD,aAAO,MAAM,CAAC,EAAE,QAAQ,CAAC,UAAU;AACjC,aAAK,WAAW,IAAI,KAAK;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,MAAM,qBAAqB,SAAsC;AAC/D,WAAO,MAAM,KAAK,yBAAyB,OAAO;AAAA,EACpD;AAAA,EAEA,MAAM,kCACJ,WACiB;AACjB,UAAM,aAAa,aAAa,OAAO;AAEvC,SAAK,WAAW,IAAI,UAAU;AAE9B,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,KAAK,yBAAyB;AACpC,WAAK,MAAM;AAAA,IACb;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAM,yBACJ,UAAsC,CAAC,GACjB;AACtB,UAAM,EAAE,oBAAoB,MAAM,gBAAgB,IAAI;AAEtD,QAAI,UACF,qBACA,0BACA;AAEF,QAAI,oBAAoB,QAAW;AACjC,YAAM,gBAAgB,KAAK,gBAAgB;AAAA,QACzC;AAAA,QACA;AAAA,MACF;AACA,iCAA2B,cAAc,cAAc,YAAY;AAEnE,uBAAiB,oBAAoB,cAAc,cAAc,OAAO;AAExE,UAAI;AACF,cAAM,SAAS,MAAM,KAAK,gBAAgB;AAAA,UACxC;AAAA,UACA;AAAA,QACF;AACA,8BAAsB,UAAU;AAAA,MAClC,QAAQ;AACN,8BAAsB;AAAA,MACxB;AACA,iBAAW,IAAI,SAAS,cAAc,QAAQ;AAAA,IAChD;AAEA,4BAAa,KAAK;AAElB,4DACE,KAAK,2CAA2C;AAElD,wCAAmB,oBAAoB,KAAK,cAAc;AAE1D,QAAI;AACF,oDAAwB,MAAM,KAAK,wBAAwB;AAAA,IAC7D,SAAS,GAAG;AACV,cAAQ,MAAM,CAAC;AACf,oDAAwB;AAAA,IAC1B;AAEA,UAAM,qBAAqB,MAAM,4BAA4B;AAAA,MAC3D;AAAA,MACA;AAAA,MACA;AAAA,MACA,sBAAsB,KAAK,mBAAmB;AAAA,QAC5C;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,iCAAiC,KAAK,kBAAkB;AAAA,QACtD;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,UAAU,KAAK;AAAA,MACf;AAAA,IACF,CAAC;AAED,QAAI,mBAAmB;AACrB,YAAM,UAAU,MAAM,cAAc;AACpC,WAAK,OAAO,CAAC,UAAU;AACrB,YAAI,KAAK,mBAAmB,SAAS;AACnC,gBAAM,kBAAkB,mBAAmB;AAC3C,gBAAM,4BACJ,mBAAmB;AACrB,gBAAM,kBAAkB,mBAAmB;AAAA,QAC7C;AACA,cAAM,6BAAN,MAAM,2BAA6B,CAAC;AACpC,cAAM,yBAAyB,OAAO,IAAI;AAAA,UACxC,iBAAiB,mBAAmB;AAAA,UACpC,2BACE,mBAAmB;AAAA,UACrB,iBAAiB,mBAAmB;AAAA,QACtC;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,iBAAiB,WAAmB;AAClC,SAAK,WAAW,OAAO,SAAS;AAChC,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,WAAK,YAAY;AAAA,IACnB;AAAA,EACF;AAAA,EAEA,cAAc;AACZ,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AACA,SAAK,WAAW,MAAM;AACtB,SAAK,WAAW;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOS,UAAU;AACjB,UAAM,QAAQ;AACd,SAAK,YAAY;AAAA,EACnB;AAAA,EAEQ,QAAQ;AACd,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AAEA,SAAK,aAAa,YAAY,YAAY;AACxC,YAAM,cAAc,MAAM,KAAK,yBAAyB,CAAC;AAAA,IAC3D,GAAG,KAAK,aAAa;AAAA,EACvB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,aAAa,iBAAwC;AACzD,UAAM,KAAK,yBAAyB,EAAE,gBAAgB,CAAC;AAAA,EACzD;AAAA,EAEQ,aAAa;AACnB,SAAK,OAAO,MAAM;AAChB,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA,EAEA,MAAc,0BAA0B;AACtC,UAAM,oCACJ,MAAM,KAAK,sCAAsC;AACnD,UAAM,oCACJ,KAAK,wCAAwC,KAAK;AAEpD,WACE,qCAAqC;AAAA,EAEzC;AAAA,EAEA,gBACE,sBACA,cACmD;AACnD,QACE,CAAC,KAAK,MAAM,mBACZ,KAAK,MAAM,oBAAoB,mBAAmB,YAClD;AACA,aAAO,CAAC;AAAA,IACV;AACA,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK,MAAM;AAAA,IACb;AAAA,EACF;AAYF;AAxTE;AA8SM;AAAA,kCAA6B,eAAC,wBAAsC;AACxE,QAAM,aAAa,uBAAuB,eAAe;AAEzD,MAAI,eAAe,KAAK,gBAAgB;AACtC,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAChD,UAAM,KAAK,aAAa;AAExB,SAAK,iBAAiB;AAAA,EACxB;AACF;AAGF,IAAO,2BAAQ;;;ACjjBf,eAAO,4BAAmD;AAAA,EACxD;AAAA,EACA;AAAA,EACA,mBAAAA;AAAA,EACA;AAAA,EACA,mCAAAC;AAAA,EACA,8BAAAC;AAAA,EACA;AAAA,EACA,0BAAAC;AAAA,EACA,uBAAAC;AAAA,EACA;AAAA,EACA;AACF,GA8BgC;AAC9B,MAAI;AACF,QAAI,qBAAqB;AACvB,UAAI;AACJ,UAAI;AACF,oBAAY,MAAMJ,mBAAkB,sBAAsB,QAAQ;AAAA,MACpE,QAAQ;AACN,oBAAY,MAAMC,mCAAkC,QAAQ;AAAA,MAC9D;AACA,YAAM,EAAE,+BAA+B,sBAAsB,IAC3D,UAAU;AACZ,YAAM,4BAA4BG;AAAA,QAChC;AAAA,QACA;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB;AAAA,QACA,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,WAAW,0BAA0B;AACnC,YAAM,YAAY,MAAMF;AAAA,QACtB;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF;AACA,UAAM,IAAI,MAAM,oDAAoD;AAAA,EACtE,QAAQ;AACN,QAAI;AACF,YAAM,YAAY,MAAMC,0BAAyB,QAAQ;AACzD,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,SAAS,OAAO;AACd,UAAI,iBAAiB,OAAO;AAC1B,cAAM,IAAI;AAAA,UACR,6CAA6C,MAAM,OAAO;AAAA,QAC5D;AAAA,MACF;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF","sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport fetchGasEstimatesViaEthFeeHistory from './fetchGasEstimatesViaEthFeeHistory';\nimport {\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n} from './gas-util';\n\nexport const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId & SingleChainGasFeeState;\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for\n   * testing purposes.\n   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,\n    EIP1559APIEndpoint,\n    clientId,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    legacyAPIEndpoint?: string;\n    EIP1559APIEndpoint: string;\n    clientId?: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = EIP1559APIEndpoint;\n    this.legacyAPIEndpoint = legacyAPIEndpoint;\n    this.clientId = clientId;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchGasEstimatesViaEthFeeHistory,\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n    });\n\n    if (shouldUpdateState) {\n      const chainId = toHex(decimalChainId);\n      this.update((state) => {\n        if (this.currentChainId === chainId) {\n          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n          state.estimatedGasFeeTimeBounds =\n            gasFeeCalculations.estimatedGasFeeTimeBounds;\n          state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        }\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[chainId] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchGasEstimatesViaEthFeeHistory - A function that fetches gas estimates using\n * `eth_feeHistory` (an EIP-1559 feature).\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations({\n  isEIP1559Compatible,\n  isLegacyGasAPICompatible,\n  fetchGasEstimates,\n  fetchGasEstimatesUrl,\n  fetchGasEstimatesViaEthFeeHistory,\n  fetchLegacyGasPriceEstimates,\n  fetchLegacyGasPriceEstimatesUrl,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n  clientId,\n  ethQuery,\n}: {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchGasEstimatesViaEthFeeHistory: (\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    ethQuery: any,\n  ) => Promise<GasFeeEstimates>;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n}): Promise<GasFeeCalculations> {\n  try {\n    if (isEIP1559Compatible) {\n      let estimates: GasFeeEstimates;\n      try {\n        estimates = await fetchGasEstimates(fetchGasEstimatesUrl, clientId);\n      } catch {\n        estimates = await fetchGasEstimatesViaEthFeeHistory(ethQuery);\n      }\n      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n        estimates.medium;\n      const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n        suggestedMaxPriorityFeePerGas,\n        suggestedMaxFeePerGas,\n        estimates,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds,\n        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n      };\n    } else if (isLegacyGasAPICompatible) {\n      const estimates = await fetchLegacyGasPriceEstimates(\n        fetchLegacyGasPriceEstimatesUrl,\n        clientId,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n      };\n    }\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    try {\n      const estimates = await fetchEthGasPriceEstimate(ethQuery);\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n      };\n    } catch (error) {\n      if (error instanceof Error) {\n        throw new Error(\n          `Gas fee/price estimation failed. Message: ${error.message}`,\n        );\n      }\n      throw error;\n    }\n  }\n}\n"]}
-\ No newline at end of file
-diff --git a/dist/chunk-L45HVISM.mjs b/dist/chunk-L45HVISM.mjs
-new file mode 100644
-index 0000000000000000000000000000000000000000..219a2f2e453cc4104da16c60a54c4cdd27dbb504
---- /dev/null
-+++ b/dist/chunk-L45HVISM.mjs
-@@ -0,0 +1,370 @@
-+import {
-+  fetchGasEstimatesViaEthFeeHistory
-+} from "./chunk-EXCWMMNV.mjs";
-+import {
-+  calculateTimeEstimate,
-+  fetchEthGasPriceEstimate,
-+  fetchGasEstimates,
-+  fetchLegacyGasPriceEstimates
-+} from "./chunk-CCRUODGE.mjs";
-+import {
-+  __privateAdd,
-+  __privateGet,
-+  __privateMethod,
-+  __privateSet
-+} from "./chunk-XUI43LEZ.mjs";
-+
-+// src/GasFeeController.ts
-+import {
-+  convertHexToDecimal,
-+  safelyExecute,
-+  toHex
-+} from "@metamask/controller-utils";
-+import EthQuery from "@metamask/eth-query";
-+import { StaticIntervalPollingController } from "@metamask/polling-controller";
-+import { v1 as random } from "uuid";
-+var LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;
-+var GAS_ESTIMATE_TYPES = {
-+  FEE_MARKET: "fee-market",
-+  LEGACY: "legacy",
-+  ETH_GASPRICE: "eth_gasPrice",
-+  NONE: "none"
-+};
-+var metadata = {
-+  gasFeeEstimatesByChainId: {
-+    persist: true,
-+    anonymous: false
-+  },
-+  gasFeeEstimates: { persist: true, anonymous: false },
-+  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
-+  gasEstimateType: { persist: true, anonymous: false }
-+};
-+var name = "GasFeeController";
-+var defaultState = {
-+  gasFeeEstimatesByChainId: {},
-+  gasFeeEstimates: {},
-+  estimatedGasFeeTimeBounds: {},
-+  gasEstimateType: GAS_ESTIMATE_TYPES.NONE
-+};
-+var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
-+var GasFeeController = class extends StaticIntervalPollingController {
-+  /**
-+   * Creates a GasFeeController instance.
-+   *
-+   * @param options - The controller options.
-+   * @param options.interval - The time in milliseconds to wait between polls.
-+   * @param options.messenger - The controller messenger.
-+   * @param options.state - The initial state.
-+   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
-+   * network is EIP-1559 compatible.
-+   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
-+   * current network is compatible with the legacy gas price API.
-+   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
-+   * account is EIP-1559 compatible.
-+   * @param options.getChainId - Returns the current chain ID.
-+   * @param options.getProvider - Returns a network provider for the current network.
-+   * @param options.onNetworkDidChange - A function for registering an event handler for the
-+   * network state change event.
-+   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for
-+   * testing purposes.
-+   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.
-+   * @param options.clientId - The client ID used to identify to the gas estimation API who is
-+   * asking for estimates.
-+   */
-+  constructor({
-+    interval = 15e3,
-+    messenger,
-+    state,
-+    getCurrentNetworkEIP1559Compatibility,
-+    getCurrentAccountEIP1559Compatibility,
-+    getChainId,
-+    getCurrentNetworkLegacyGasAPICompatibility,
-+    getProvider,
-+    onNetworkDidChange,
-+    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,
-+    EIP1559APIEndpoint,
-+    clientId
-+  }) {
-+    super({
-+      name,
-+      metadata,
-+      messenger,
-+      state: { ...defaultState, ...state }
-+    });
-+    __privateAdd(this, _onNetworkControllerDidChange);
-+    __privateAdd(this, _getProvider, void 0);
-+    this.intervalDelay = interval;
-+    this.setIntervalLength(interval);
-+    this.pollTokens = /* @__PURE__ */ new Set();
-+    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
-+    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
-+    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
-+    __privateSet(this, _getProvider, getProvider);
-+    this.EIP1559APIEndpoint = EIP1559APIEndpoint;
-+    this.legacyAPIEndpoint = legacyAPIEndpoint;
-+    this.clientId = clientId;
-+    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
-+    if (onNetworkDidChange && getChainId) {
-+      this.currentChainId = getChainId();
-+      onNetworkDidChange(async (networkControllerState) => {
-+        await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
-+      });
-+    } else {
-+      this.currentChainId = this.messagingSystem.call(
-+        "NetworkController:getState"
-+      ).providerConfig.chainId;
-+      this.messagingSystem.subscribe(
-+        "NetworkController:networkDidChange",
-+        async (networkControllerState) => {
-+          await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
-+        }
-+      );
-+    }
-+  }
-+  async resetPolling() {
-+    if (this.pollTokens.size !== 0) {
-+      const tokens = Array.from(this.pollTokens);
-+      this.stopPolling();
-+      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
-+      tokens.slice(1).forEach((token) => {
-+        this.pollTokens.add(token);
-+      });
-+    }
-+  }
-+  async fetchGasFeeEstimates(options) {
-+    return await this._fetchGasFeeEstimateData(options);
-+  }
-+  async getGasFeeEstimatesAndStartPolling(pollToken) {
-+    const _pollToken = pollToken || random();
-+    this.pollTokens.add(_pollToken);
-+    if (this.pollTokens.size === 1) {
-+      await this._fetchGasFeeEstimateData();
-+      this._poll();
-+    }
-+    return _pollToken;
-+  }
-+  /**
-+   * Gets and sets gasFeeEstimates in state.
-+   *
-+   * @param options - The gas fee estimate options.
-+   * @param options.shouldUpdateState - Determines whether the state should be updated with the
-+   * updated gas estimates.
-+   * @returns The gas fee estimates.
-+   */
-+  async _fetchGasFeeEstimateData(options = {}) {
-+    const { shouldUpdateState = true, networkClientId } = options;
-+    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
-+    if (networkClientId !== void 0) {
-+      const networkClient = this.messagingSystem.call(
-+        "NetworkController:getNetworkClientById",
-+        networkClientId
-+      );
-+      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
-+      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);
-+      try {
-+        const result = await this.messagingSystem.call(
-+          "NetworkController:getEIP1559Compatibility",
-+          networkClientId
-+        );
-+        isEIP1559Compatible = result || false;
-+      } catch {
-+        isEIP1559Compatible = false;
-+      }
-+      ethQuery = new EthQuery(networkClient.provider);
-+    }
-+    ethQuery ?? (ethQuery = this.ethQuery);
-+    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
-+    decimalChainId ?? (decimalChainId = convertHexToDecimal(this.currentChainId));
-+    try {
-+      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
-+    } catch (e) {
-+      console.error(e);
-+      isEIP1559Compatible ?? (isEIP1559Compatible = false);
-+    }
-+    const gasFeeCalculations = await determineGasFeeCalculations({
-+      isEIP1559Compatible,
-+      isLegacyGasAPICompatible,
-+      fetchGasEstimates,
-+      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
-+        "<chain_id>",
-+        `${decimalChainId}`
-+      ),
-+      fetchGasEstimatesViaEthFeeHistory,
-+      fetchLegacyGasPriceEstimates,
-+      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
-+        "<chain_id>",
-+        `${decimalChainId}`
-+      ),
-+      fetchEthGasPriceEstimate,
-+      calculateTimeEstimate,
-+      clientId: this.clientId,
-+      ethQuery
-+    });
-+    if (shouldUpdateState) {
-+      const chainId = toHex(decimalChainId);
-+      this.update((state) => {
-+        if (this.currentChainId === chainId) {
-+          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
-+          state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
-+          state.gasEstimateType = gasFeeCalculations.gasEstimateType;
-+        }
-+        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
-+        state.gasFeeEstimatesByChainId[chainId] = {
-+          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
-+          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
-+          gasEstimateType: gasFeeCalculations.gasEstimateType
-+        };
-+      });
-+    }
-+    return gasFeeCalculations;
-+  }
-+  /**
-+   * Remove the poll token, and stop polling if the set of poll tokens is empty.
-+   *
-+   * @param pollToken - The poll token to disconnect.
-+   */
-+  disconnectPoller(pollToken) {
-+    this.pollTokens.delete(pollToken);
-+    if (this.pollTokens.size === 0) {
-+      this.stopPolling();
-+    }
-+  }
-+  stopPolling() {
-+    if (this.intervalId) {
-+      clearInterval(this.intervalId);
-+    }
-+    this.pollTokens.clear();
-+    this.resetState();
-+  }
-+  /**
-+   * Prepare to discard this controller.
-+   *
-+   * This stops any active polling.
-+   */
-+  destroy() {
-+    super.destroy();
-+    this.stopPolling();
-+  }
-+  _poll() {
-+    if (this.intervalId) {
-+      clearInterval(this.intervalId);
-+    }
-+    this.intervalId = setInterval(async () => {
-+      await safelyExecute(() => this._fetchGasFeeEstimateData());
-+    }, this.intervalDelay);
-+  }
-+  /**
-+   * Fetching token list from the Token Service API.
-+   *
-+   * @private
-+   * @param networkClientId - The ID of the network client triggering the fetch.
-+   * @returns A promise that resolves when this operation completes.
-+   */
-+  async _executePoll(networkClientId) {
-+    await this._fetchGasFeeEstimateData({ networkClientId });
-+  }
-+  resetState() {
-+    this.update(() => {
-+      return defaultState;
-+    });
-+  }
-+  async getEIP1559Compatibility() {
-+    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
-+    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
-+    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
-+  }
-+  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
-+    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
-+      return {};
-+    }
-+    return calculateTimeEstimate(
-+      maxPriorityFeePerGas,
-+      maxFeePerGas,
-+      this.state.gasFeeEstimates
-+    );
-+  }
-+};
-+_getProvider = new WeakMap();
-+_onNetworkControllerDidChange = new WeakSet();
-+onNetworkControllerDidChange_fn = async function(networkControllerState) {
-+  const newChainId = networkControllerState.providerConfig.chainId;
-+  if (newChainId !== this.currentChainId) {
-+    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
-+    await this.resetPolling();
-+    this.currentChainId = newChainId;
-+  }
-+};
-+var GasFeeController_default = GasFeeController;
-+
-+// src/determineGasFeeCalculations.ts
-+async function determineGasFeeCalculations({
-+  isEIP1559Compatible,
-+  isLegacyGasAPICompatible,
-+  fetchGasEstimates: fetchGasEstimates2,
-+  fetchGasEstimatesUrl,
-+  fetchGasEstimatesViaEthFeeHistory: fetchGasEstimatesViaEthFeeHistory2,
-+  fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
-+  fetchLegacyGasPriceEstimatesUrl,
-+  fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2,
-+  calculateTimeEstimate: calculateTimeEstimate2,
-+  clientId,
-+  ethQuery
-+}) {
-+  try {
-+    if (isEIP1559Compatible) {
-+      let estimates;
-+      try {
-+        estimates = await fetchGasEstimates2(fetchGasEstimatesUrl, clientId);
-+      } catch {
-+        estimates = await fetchGasEstimatesViaEthFeeHistory2(ethQuery);
-+      }
-+      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
-+      const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
-+        suggestedMaxPriorityFeePerGas,
-+        suggestedMaxFeePerGas,
-+        estimates
-+      );
-+      return {
-+        gasFeeEstimates: estimates,
-+        estimatedGasFeeTimeBounds,
-+        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
-+      };
-+    } else if (isLegacyGasAPICompatible) {
-+      const estimates = await fetchLegacyGasPriceEstimates2(
-+        fetchLegacyGasPriceEstimatesUrl,
-+        clientId
-+      );
-+      return {
-+        gasFeeEstimates: estimates,
-+        estimatedGasFeeTimeBounds: {},
-+        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
-+      };
-+    }
-+    throw new Error("Main gas fee/price estimation failed. Use fallback");
-+  } catch {
-+    try {
-+      const estimates = await fetchEthGasPriceEstimate2(ethQuery);
-+      return {
-+        gasFeeEstimates: estimates,
-+        estimatedGasFeeTimeBounds: {},
-+        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
-+      };
-+    } catch (error) {
-+      if (error instanceof Error) {
-+        throw new Error(
-+          `Gas fee/price estimation failed. Message: ${error.message}`
-+        );
-+      }
-+      throw error;
-+    }
-+  }
-+}
-+
-+export {
-+  determineGasFeeCalculations,
-+  LEGACY_GAS_PRICES_API_URL,
-+  GAS_ESTIMATE_TYPES,
-+  GasFeeController,
-+  GasFeeController_default
-+};
-+//# sourceMappingURL=chunk-L45HVISM.mjs.map
-\ No newline at end of file
-diff --git a/dist/chunk-L45HVISM.mjs.map b/dist/chunk-L45HVISM.mjs.map
-new file mode 100644
-index 0000000000000000000000000000000000000000..d45d573d02b1be6f8da2687a772e7dac7884d8ff
---- /dev/null
-+++ b/dist/chunk-L45HVISM.mjs.map
-@@ -0,0 +1 @@
-+{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport fetchGasEstimatesViaEthFeeHistory from './fetchGasEstimatesViaEthFeeHistory';\nimport {\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n} from './gas-util';\n\nexport const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId & SingleChainGasFeeState;\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for\n   * testing purposes.\n   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,\n    EIP1559APIEndpoint,\n    clientId,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    legacyAPIEndpoint?: string;\n    EIP1559APIEndpoint: string;\n    clientId?: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = EIP1559APIEndpoint;\n    this.legacyAPIEndpoint = legacyAPIEndpoint;\n    this.clientId = clientId;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchGasEstimatesViaEthFeeHistory,\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n    });\n\n    if (shouldUpdateState) {\n      const chainId = toHex(decimalChainId);\n      this.update((state) => {\n        if (this.currentChainId === chainId) {\n          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n          state.estimatedGasFeeTimeBounds =\n            gasFeeCalculations.estimatedGasFeeTimeBounds;\n          state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        }\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[chainId] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchGasEstimatesViaEthFeeHistory - A function that fetches gas estimates using\n * `eth_feeHistory` (an EIP-1559 feature).\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations({\n  isEIP1559Compatible,\n  isLegacyGasAPICompatible,\n  fetchGasEstimates,\n  fetchGasEstimatesUrl,\n  fetchGasEstimatesViaEthFeeHistory,\n  fetchLegacyGasPriceEstimates,\n  fetchLegacyGasPriceEstimatesUrl,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n  clientId,\n  ethQuery,\n}: {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchGasEstimatesViaEthFeeHistory: (\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    ethQuery: any,\n  ) => Promise<GasFeeEstimates>;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n}): Promise<GasFeeCalculations> {\n  try {\n    if (isEIP1559Compatible) {\n      let estimates: GasFeeEstimates;\n      try {\n        estimates = await fetchGasEstimates(fetchGasEstimatesUrl, clientId);\n      } catch {\n        estimates = await fetchGasEstimatesViaEthFeeHistory(ethQuery);\n      }\n      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n        estimates.medium;\n      const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n        suggestedMaxPriorityFeePerGas,\n        suggestedMaxFeePerGas,\n        estimates,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds,\n        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n      };\n    } else if (isLegacyGasAPICompatible) {\n      const estimates = await fetchLegacyGasPriceEstimates(\n        fetchLegacyGasPriceEstimatesUrl,\n        clientId,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n      };\n    }\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    try {\n      const estimates = await fetchEthGasPriceEstimate(ethQuery);\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n      };\n    } catch (error) {\n      if (error instanceof Error) {\n        throw new Error(\n          `Gas fee/price estimation failed. Message: ${error.message}`,\n        );\n      }\n      throw error;\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAKA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,OAAO,cAAc;AAUrB,SAAS,uCAAuC;AAEhD,SAAS,MAAM,cAAc;AAWtB,IAAM,4BAA4B;AA0BlC,IAAM,qBAAqB;AAAA,EAChC,YAAY;AAAA,EACZ,QAAQ;AAAA,EACR,cAAc;AAAA,EACd,MAAM;AACR;AAiGA,IAAM,WAAW;AAAA,EACf,0BAA0B;AAAA,IACxB,SAAS;AAAA,IACT,WAAW;AAAA,EACb;AAAA,EACA,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EACnD,2BAA2B,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EAC7D,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AACrD;AAkDA,IAAM,OAAO;AA0Bb,IAAM,eAA4B;AAAA,EAChC,0BAA0B,CAAC;AAAA,EAC3B,iBAAiB,CAAC;AAAA,EAClB,2BAA2B,CAAC;AAAA,EAC5B,iBAAiB,mBAAmB;AACtC;AA1PA;AA+PO,IAAM,mBAAN,cAA+B,gCAIpC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAgDA,YAAY;AAAA,IACV,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,EACF,GAaG;AACD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,EAAE,GAAG,cAAc,GAAG,MAAM;AAAA,IACrC,CAAC;AAqPH,uBAAM;AA9SN;AA0DE,SAAK,gBAAgB;AACrB,SAAK,kBAAkB,QAAQ;AAC/B,SAAK,aAAa,oBAAI,IAAI;AAC1B,SAAK,wCACH;AACF,SAAK,6CACH;AACF,SAAK,wCACH;AACF,uBAAK,cAAe;AACpB,SAAK,qBAAqB;AAC1B,SAAK,oBAAoB;AACzB,SAAK,WAAW;AAEhB,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAEhD,QAAI,sBAAsB,YAAY;AACpC,WAAK,iBAAiB,WAAW;AACjC,yBAAmB,OAAO,2BAA2B;AACnD,cAAM,sBAAK,gEAAL,WAAmC;AAAA,MAC3C,CAAC;AAAA,IACH,OAAO;AACL,WAAK,iBAAiB,KAAK,gBAAgB;AAAA,QACzC;AAAA,MACF,EAAE,eAAe;AACjB,WAAK,gBAAgB;AAAA,QACnB;AAAA,QACA,OAAO,2BAA2B;AAChC,gBAAM,sBAAK,gEAAL,WAAmC;AAAA,QAC3C;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,eAAe;AACnB,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,SAAS,MAAM,KAAK,KAAK,UAAU;AACzC,WAAK,YAAY;AACjB,YAAM,KAAK,kCAAkC,OAAO,CAAC,CAAC;AACtD,aAAO,MAAM,CAAC,EAAE,QAAQ,CAAC,UAAU;AACjC,aAAK,WAAW,IAAI,KAAK;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,MAAM,qBAAqB,SAAsC;AAC/D,WAAO,MAAM,KAAK,yBAAyB,OAAO;AAAA,EACpD;AAAA,EAEA,MAAM,kCACJ,WACiB;AACjB,UAAM,aAAa,aAAa,OAAO;AAEvC,SAAK,WAAW,IAAI,UAAU;AAE9B,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,KAAK,yBAAyB;AACpC,WAAK,MAAM;AAAA,IACb;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAM,yBACJ,UAAsC,CAAC,GACjB;AACtB,UAAM,EAAE,oBAAoB,MAAM,gBAAgB,IAAI;AAEtD,QAAI,UACF,qBACA,0BACA;AAEF,QAAI,oBAAoB,QAAW;AACjC,YAAM,gBAAgB,KAAK,gBAAgB;AAAA,QACzC;AAAA,QACA;AAAA,MACF;AACA,iCAA2B,cAAc,cAAc,YAAY;AAEnE,uBAAiB,oBAAoB,cAAc,cAAc,OAAO;AAExE,UAAI;AACF,cAAM,SAAS,MAAM,KAAK,gBAAgB;AAAA,UACxC;AAAA,UACA;AAAA,QACF;AACA,8BAAsB,UAAU;AAAA,MAClC,QAAQ;AACN,8BAAsB;AAAA,MACxB;AACA,iBAAW,IAAI,SAAS,cAAc,QAAQ;AAAA,IAChD;AAEA,4BAAa,KAAK;AAElB,4DACE,KAAK,2CAA2C;AAElD,wCAAmB,oBAAoB,KAAK,cAAc;AAE1D,QAAI;AACF,oDAAwB,MAAM,KAAK,wBAAwB;AAAA,IAC7D,SAAS,GAAG;AACV,cAAQ,MAAM,CAAC;AACf,oDAAwB;AAAA,IAC1B;AAEA,UAAM,qBAAqB,MAAM,4BAA4B;AAAA,MAC3D;AAAA,MACA;AAAA,MACA;AAAA,MACA,sBAAsB,KAAK,mBAAmB;AAAA,QAC5C;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,iCAAiC,KAAK,kBAAkB;AAAA,QACtD;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,UAAU,KAAK;AAAA,MACf;AAAA,IACF,CAAC;AAED,QAAI,mBAAmB;AACrB,YAAM,UAAU,MAAM,cAAc;AACpC,WAAK,OAAO,CAAC,UAAU;AACrB,YAAI,KAAK,mBAAmB,SAAS;AACnC,gBAAM,kBAAkB,mBAAmB;AAC3C,gBAAM,4BACJ,mBAAmB;AACrB,gBAAM,kBAAkB,mBAAmB;AAAA,QAC7C;AACA,cAAM,6BAAN,MAAM,2BAA6B,CAAC;AACpC,cAAM,yBAAyB,OAAO,IAAI;AAAA,UACxC,iBAAiB,mBAAmB;AAAA,UACpC,2BACE,mBAAmB;AAAA,UACrB,iBAAiB,mBAAmB;AAAA,QACtC;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,iBAAiB,WAAmB;AAClC,SAAK,WAAW,OAAO,SAAS;AAChC,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,WAAK,YAAY;AAAA,IACnB;AAAA,EACF;AAAA,EAEA,cAAc;AACZ,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AACA,SAAK,WAAW,MAAM;AACtB,SAAK,WAAW;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOS,UAAU;AACjB,UAAM,QAAQ;AACd,SAAK,YAAY;AAAA,EACnB;AAAA,EAEQ,QAAQ;AACd,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AAEA,SAAK,aAAa,YAAY,YAAY;AACxC,YAAM,cAAc,MAAM,KAAK,yBAAyB,CAAC;AAAA,IAC3D,GAAG,KAAK,aAAa;AAAA,EACvB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,aAAa,iBAAwC;AACzD,UAAM,KAAK,yBAAyB,EAAE,gBAAgB,CAAC;AAAA,EACzD;AAAA,EAEQ,aAAa;AACnB,SAAK,OAAO,MAAM;AAChB,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA,EAEA,MAAc,0BAA0B;AACtC,UAAM,oCACJ,MAAM,KAAK,sCAAsC;AACnD,UAAM,oCACJ,KAAK,wCAAwC,KAAK;AAEpD,WACE,qCAAqC;AAAA,EAEzC;AAAA,EAEA,gBACE,sBACA,cACmD;AACnD,QACE,CAAC,KAAK,MAAM,mBACZ,KAAK,MAAM,oBAAoB,mBAAmB,YAClD;AACA,aAAO,CAAC;AAAA,IACV;AACA,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK,MAAM;AAAA,IACb;AAAA,EACF;AAYF;AAxTE;AA8SM;AAAA,kCAA6B,eAAC,wBAAsC;AACxE,QAAM,aAAa,uBAAuB,eAAe;AAEzD,MAAI,eAAe,KAAK,gBAAgB;AACtC,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAChD,UAAM,KAAK,aAAa;AAExB,SAAK,iBAAiB;AAAA,EACxB;AACF;AAGF,IAAO,2BAAQ;;;ACjjBf,eAAO,4BAAmD;AAAA,EACxD;AAAA,EACA;AAAA,EACA,mBAAAA;AAAA,EACA;AAAA,EACA,mCAAAC;AAAA,EACA,8BAAAC;AAAA,EACA;AAAA,EACA,0BAAAC;AAAA,EACA,uBAAAC;AAAA,EACA;AAAA,EACA;AACF,GA8BgC;AAC9B,MAAI;AACF,QAAI,qBAAqB;AACvB,UAAI;AACJ,UAAI;AACF,oBAAY,MAAMJ,mBAAkB,sBAAsB,QAAQ;AAAA,MACpE,QAAQ;AACN,oBAAY,MAAMC,mCAAkC,QAAQ;AAAA,MAC9D;AACA,YAAM,EAAE,+BAA+B,sBAAsB,IAC3D,UAAU;AACZ,YAAM,4BAA4BG;AAAA,QAChC;AAAA,QACA;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB;AAAA,QACA,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,WAAW,0BAA0B;AACnC,YAAM,YAAY,MAAMF;AAAA,QACtB;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF;AACA,UAAM,IAAI,MAAM,oDAAoD;AAAA,EACtE,QAAQ;AACN,QAAI;AACF,YAAM,YAAY,MAAMC,0BAAyB,QAAQ;AACzD,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,SAAS,OAAO;AACd,UAAI,iBAAiB,OAAO;AAC1B,cAAM,IAAI;AAAA,UACR,6CAA6C,MAAM,OAAO;AAAA,QAC5D;AAAA,MACF;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF;","names":["fetchGasEstimates","fetchGasEstimatesViaEthFeeHistory","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate","calculateTimeEstimate"]}
-\ No newline at end of file
-diff --git a/dist/chunk-N5BANBTW.js b/dist/chunk-N5BANBTW.js
-deleted file mode 100644
-index 1af6409114a301a745ababc04fc13602ab97fa5e..0000000000000000000000000000000000000000
---- a/dist/chunk-N5BANBTW.js
-+++ /dev/null
-@@ -1,367 +0,0 @@
--"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
--
--var _chunkEZVGDV5Hjs = require('./chunk-EZVGDV5H.js');
--
--
--
--
--
--var _chunkF46NZXRQjs = require('./chunk-F46NZXRQ.js');
--
--
--
--
--
--var _chunkZ4BLTVTBjs = require('./chunk-Z4BLTVTB.js');
--
--// src/GasFeeController.ts
--
--
--
--
--var _controllerutils = require('@metamask/controller-utils');
--var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
--var _pollingcontroller = require('@metamask/polling-controller');
--var _uuid = require('uuid');
--var LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;
--var GAS_ESTIMATE_TYPES = {
--  FEE_MARKET: "fee-market",
--  LEGACY: "legacy",
--  ETH_GASPRICE: "eth_gasPrice",
--  NONE: "none"
--};
--var metadata = {
--  gasFeeEstimatesByChainId: {
--    persist: true,
--    anonymous: false
--  },
--  gasFeeEstimates: { persist: true, anonymous: false },
--  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
--  gasEstimateType: { persist: true, anonymous: false }
--};
--var name = "GasFeeController";
--var defaultState = {
--  gasFeeEstimatesByChainId: {},
--  gasFeeEstimates: {},
--  estimatedGasFeeTimeBounds: {},
--  gasEstimateType: GAS_ESTIMATE_TYPES.NONE
--};
--var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
--var GasFeeController = class extends _pollingcontroller.StaticIntervalPollingController {
--  /**
--   * Creates a GasFeeController instance.
--   *
--   * @param options - The controller options.
--   * @param options.interval - The time in milliseconds to wait between polls.
--   * @param options.messenger - The controller messenger.
--   * @param options.state - The initial state.
--   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
--   * network is EIP-1559 compatible.
--   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
--   * current network is compatible with the legacy gas price API.
--   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
--   * account is EIP-1559 compatible.
--   * @param options.getChainId - Returns the current chain ID.
--   * @param options.getProvider - Returns a network provider for the current network.
--   * @param options.onNetworkDidChange - A function for registering an event handler for the
--   * network state change event.
--   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for
--   * testing purposes.
--   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.
--   * @param options.clientId - The client ID used to identify to the gas estimation API who is
--   * asking for estimates.
--   */
--  constructor({
--    interval = 15e3,
--    messenger,
--    state,
--    getCurrentNetworkEIP1559Compatibility,
--    getCurrentAccountEIP1559Compatibility,
--    getChainId,
--    getCurrentNetworkLegacyGasAPICompatibility,
--    getProvider,
--    onNetworkDidChange,
--    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,
--    EIP1559APIEndpoint,
--    clientId
--  }) {
--    super({
--      name,
--      metadata,
--      messenger,
--      state: { ...defaultState, ...state }
--    });
--    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _onNetworkControllerDidChange);
--    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getProvider, void 0);
--    this.intervalDelay = interval;
--    this.setIntervalLength(interval);
--    this.pollTokens = /* @__PURE__ */ new Set();
--    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
--    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
--    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
--    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _getProvider, getProvider);
--    this.EIP1559APIEndpoint = EIP1559APIEndpoint;
--    this.legacyAPIEndpoint = legacyAPIEndpoint;
--    this.clientId = clientId;
--    this.ethQuery = new (0, _ethquery2.default)(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _getProvider).call(this));
--    if (onNetworkDidChange && getChainId) {
--      this.currentChainId = getChainId();
--      onNetworkDidChange(async (networkControllerState) => {
--        await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
--      });
--    } else {
--      this.currentChainId = this.messagingSystem.call(
--        "NetworkController:getState"
--      ).providerConfig.chainId;
--      this.messagingSystem.subscribe(
--        "NetworkController:networkDidChange",
--        async (networkControllerState) => {
--          await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
--        }
--      );
--    }
--  }
--  async resetPolling() {
--    if (this.pollTokens.size !== 0) {
--      const tokens = Array.from(this.pollTokens);
--      this.stopPolling();
--      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
--      tokens.slice(1).forEach((token) => {
--        this.pollTokens.add(token);
--      });
--    }
--  }
--  async fetchGasFeeEstimates(options) {
--    return await this._fetchGasFeeEstimateData(options);
--  }
--  async getGasFeeEstimatesAndStartPolling(pollToken) {
--    const _pollToken = pollToken || _uuid.v1.call(void 0, );
--    this.pollTokens.add(_pollToken);
--    if (this.pollTokens.size === 1) {
--      await this._fetchGasFeeEstimateData();
--      this._poll();
--    }
--    return _pollToken;
--  }
--  /**
--   * Gets and sets gasFeeEstimates in state.
--   *
--   * @param options - The gas fee estimate options.
--   * @param options.shouldUpdateState - Determines whether the state should be updated with the
--   * updated gas estimates.
--   * @returns The gas fee estimates.
--   */
--  async _fetchGasFeeEstimateData(options = {}) {
--    const { shouldUpdateState = true, networkClientId } = options;
--    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
--    if (networkClientId !== void 0) {
--      const networkClient = this.messagingSystem.call(
--        "NetworkController:getNetworkClientById",
--        networkClientId
--      );
--      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
--      decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, networkClient.configuration.chainId);
--      try {
--        const result = await this.messagingSystem.call(
--          "NetworkController:getEIP1559Compatibility",
--          networkClientId
--        );
--        isEIP1559Compatible = result || false;
--      } catch {
--        isEIP1559Compatible = false;
--      }
--      ethQuery = new (0, _ethquery2.default)(networkClient.provider);
--    }
--    ethQuery ?? (ethQuery = this.ethQuery);
--    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
--    decimalChainId ?? (decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, this.currentChainId));
--    try {
--      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
--    } catch (e) {
--      console.error(e);
--      isEIP1559Compatible ?? (isEIP1559Compatible = false);
--    }
--    const gasFeeCalculations = await determineGasFeeCalculations({
--      isEIP1559Compatible,
--      isLegacyGasAPICompatible,
--      fetchGasEstimates: _chunkF46NZXRQjs.fetchGasEstimates,
--      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
--        "<chain_id>",
--        `${decimalChainId}`
--      ),
--      fetchGasEstimatesViaEthFeeHistory: _chunkEZVGDV5Hjs.fetchGasEstimatesViaEthFeeHistory,
--      fetchLegacyGasPriceEstimates: _chunkF46NZXRQjs.fetchLegacyGasPriceEstimates,
--      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
--        "<chain_id>",
--        `${decimalChainId}`
--      ),
--      fetchEthGasPriceEstimate: _chunkF46NZXRQjs.fetchEthGasPriceEstimate,
--      calculateTimeEstimate: _chunkF46NZXRQjs.calculateTimeEstimate,
--      clientId: this.clientId,
--      ethQuery
--    });
--    if (shouldUpdateState) {
--      this.update((state) => {
--        state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
--        state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
--        state.gasEstimateType = gasFeeCalculations.gasEstimateType;
--        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
--        state.gasFeeEstimatesByChainId[_controllerutils.toHex.call(void 0, decimalChainId)] = {
--          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
--          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
--          gasEstimateType: gasFeeCalculations.gasEstimateType
--        };
--      });
--    }
--    return gasFeeCalculations;
--  }
--  /**
--   * Remove the poll token, and stop polling if the set of poll tokens is empty.
--   *
--   * @param pollToken - The poll token to disconnect.
--   */
--  disconnectPoller(pollToken) {
--    this.pollTokens.delete(pollToken);
--    if (this.pollTokens.size === 0) {
--      this.stopPolling();
--    }
--  }
--  stopPolling() {
--    if (this.intervalId) {
--      clearInterval(this.intervalId);
--    }
--    this.pollTokens.clear();
--    this.resetState();
--  }
--  /**
--   * Prepare to discard this controller.
--   *
--   * This stops any active polling.
--   */
--  destroy() {
--    super.destroy();
--    this.stopPolling();
--  }
--  _poll() {
--    if (this.intervalId) {
--      clearInterval(this.intervalId);
--    }
--    this.intervalId = setInterval(async () => {
--      await _controllerutils.safelyExecute.call(void 0, () => this._fetchGasFeeEstimateData());
--    }, this.intervalDelay);
--  }
--  /**
--   * Fetching token list from the Token Service API.
--   *
--   * @private
--   * @param networkClientId - The ID of the network client triggering the fetch.
--   * @returns A promise that resolves when this operation completes.
--   */
--  async _executePoll(networkClientId) {
--    await this._fetchGasFeeEstimateData({ networkClientId });
--  }
--  resetState() {
--    this.update(() => {
--      return defaultState;
--    });
--  }
--  async getEIP1559Compatibility() {
--    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
--    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
--    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
--  }
--  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
--    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
--      return {};
--    }
--    return _chunkF46NZXRQjs.calculateTimeEstimate.call(void 0, 
--      maxPriorityFeePerGas,
--      maxFeePerGas,
--      this.state.gasFeeEstimates
--    );
--  }
--};
--_getProvider = new WeakMap();
--_onNetworkControllerDidChange = new WeakSet();
--onNetworkControllerDidChange_fn = async function(networkControllerState) {
--  const newChainId = networkControllerState.providerConfig.chainId;
--  if (newChainId !== this.currentChainId) {
--    this.ethQuery = new (0, _ethquery2.default)(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _getProvider).call(this));
--    await this.resetPolling();
--    this.currentChainId = newChainId;
--  }
--};
--var GasFeeController_default = GasFeeController;
--
--// src/determineGasFeeCalculations.ts
--async function determineGasFeeCalculations({
--  isEIP1559Compatible,
--  isLegacyGasAPICompatible,
--  fetchGasEstimates: fetchGasEstimates2,
--  fetchGasEstimatesUrl,
--  fetchGasEstimatesViaEthFeeHistory: fetchGasEstimatesViaEthFeeHistory2,
--  fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
--  fetchLegacyGasPriceEstimatesUrl,
--  fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2,
--  calculateTimeEstimate: calculateTimeEstimate2,
--  clientId,
--  ethQuery
--}) {
--  try {
--    if (isEIP1559Compatible) {
--      let estimates;
--      try {
--        estimates = await fetchGasEstimates2(fetchGasEstimatesUrl, clientId);
--      } catch {
--        estimates = await fetchGasEstimatesViaEthFeeHistory2(ethQuery);
--      }
--      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
--      const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
--        suggestedMaxPriorityFeePerGas,
--        suggestedMaxFeePerGas,
--        estimates
--      );
--      return {
--        gasFeeEstimates: estimates,
--        estimatedGasFeeTimeBounds,
--        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
--      };
--    } else if (isLegacyGasAPICompatible) {
--      const estimates = await fetchLegacyGasPriceEstimates2(
--        fetchLegacyGasPriceEstimatesUrl,
--        clientId
--      );
--      return {
--        gasFeeEstimates: estimates,
--        estimatedGasFeeTimeBounds: {},
--        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
--      };
--    }
--    throw new Error("Main gas fee/price estimation failed. Use fallback");
--  } catch {
--    try {
--      const estimates = await fetchEthGasPriceEstimate2(ethQuery);
--      return {
--        gasFeeEstimates: estimates,
--        estimatedGasFeeTimeBounds: {},
--        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
--      };
--    } catch (error) {
--      if (error instanceof Error) {
--        throw new Error(
--          `Gas fee/price estimation failed. Message: ${error.message}`
--        );
--      }
--      throw error;
--    }
--  }
--}
--
--
--
--
--
--
--
--exports.determineGasFeeCalculations = determineGasFeeCalculations; exports.LEGACY_GAS_PRICES_API_URL = LEGACY_GAS_PRICES_API_URL; exports.GAS_ESTIMATE_TYPES = GAS_ESTIMATE_TYPES; exports.GasFeeController = GasFeeController; exports.GasFeeController_default = GasFeeController_default;
--//# sourceMappingURL=chunk-N5BANBTW.js.map
-\ No newline at end of file
-diff --git a/dist/chunk-N5BANBTW.js.map b/dist/chunk-N5BANBTW.js.map
-deleted file mode 100644
-index 344544fa436adddd331b2152926ecaf81ae94bc2..0000000000000000000000000000000000000000
---- a/dist/chunk-N5BANBTW.js.map
-+++ /dev/null
-@@ -1 +0,0 @@
--{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"names":["fetchGasEstimates","fetchGasEstimatesViaEthFeeHistory","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate","calculateTimeEstimate"],"mappings":";;;;;;;;;;;;;;;;;AAKA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,OAAO,cAAc;AAUrB,SAAS,uCAAuC;AAEhD,SAAS,MAAM,cAAc;AAWtB,IAAM,4BAA4B;AA0BlC,IAAM,qBAAqB;AAAA,EAChC,YAAY;AAAA,EACZ,QAAQ;AAAA,EACR,cAAc;AAAA,EACd,MAAM;AACR;AAiGA,IAAM,WAAW;AAAA,EACf,0BAA0B;AAAA,IACxB,SAAS;AAAA,IACT,WAAW;AAAA,EACb;AAAA,EACA,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EACnD,2BAA2B,EAAE,SAAS,MAAM,WAAW,MAAM;AAAA,EAC7D,iBAAiB,EAAE,SAAS,MAAM,WAAW,MAAM;AACrD;AAkDA,IAAM,OAAO;AA0Bb,IAAM,eAA4B;AAAA,EAChC,0BAA0B,CAAC;AAAA,EAC3B,iBAAiB,CAAC;AAAA,EAClB,2BAA2B,CAAC;AAAA,EAC5B,iBAAiB,mBAAmB;AACtC;AA1PA;AA+PO,IAAM,mBAAN,cAA+B,gCAIpC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAgDA,YAAY;AAAA,IACV,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,EACF,GAaG;AACD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,EAAE,GAAG,cAAc,GAAG,MAAM;AAAA,IACrC,CAAC;AAkPH,uBAAM;AA3SN;AA0DE,SAAK,gBAAgB;AACrB,SAAK,kBAAkB,QAAQ;AAC/B,SAAK,aAAa,oBAAI,IAAI;AAC1B,SAAK,wCACH;AACF,SAAK,6CACH;AACF,SAAK,wCACH;AACF,uBAAK,cAAe;AACpB,SAAK,qBAAqB;AAC1B,SAAK,oBAAoB;AACzB,SAAK,WAAW;AAEhB,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAEhD,QAAI,sBAAsB,YAAY;AACpC,WAAK,iBAAiB,WAAW;AACjC,yBAAmB,OAAO,2BAA2B;AACnD,cAAM,sBAAK,gEAAL,WAAmC;AAAA,MAC3C,CAAC;AAAA,IACH,OAAO;AACL,WAAK,iBAAiB,KAAK,gBAAgB;AAAA,QACzC;AAAA,MACF,EAAE,eAAe;AACjB,WAAK,gBAAgB;AAAA,QACnB;AAAA,QACA,OAAO,2BAA2B;AAChC,gBAAM,sBAAK,gEAAL,WAAmC;AAAA,QAC3C;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,eAAe;AACnB,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,SAAS,MAAM,KAAK,KAAK,UAAU;AACzC,WAAK,YAAY;AACjB,YAAM,KAAK,kCAAkC,OAAO,CAAC,CAAC;AACtD,aAAO,MAAM,CAAC,EAAE,QAAQ,CAAC,UAAU;AACjC,aAAK,WAAW,IAAI,KAAK;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,MAAM,qBAAqB,SAAsC;AAC/D,WAAO,MAAM,KAAK,yBAAyB,OAAO;AAAA,EACpD;AAAA,EAEA,MAAM,kCACJ,WACiB;AACjB,UAAM,aAAa,aAAa,OAAO;AAEvC,SAAK,WAAW,IAAI,UAAU;AAE9B,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,YAAM,KAAK,yBAAyB;AACpC,WAAK,MAAM;AAAA,IACb;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAM,yBACJ,UAAsC,CAAC,GACjB;AACtB,UAAM,EAAE,oBAAoB,MAAM,gBAAgB,IAAI;AAEtD,QAAI,UACF,qBACA,0BACA;AAEF,QAAI,oBAAoB,QAAW;AACjC,YAAM,gBAAgB,KAAK,gBAAgB;AAAA,QACzC;AAAA,QACA;AAAA,MACF;AACA,iCAA2B,cAAc,cAAc,YAAY;AAEnE,uBAAiB,oBAAoB,cAAc,cAAc,OAAO;AAExE,UAAI;AACF,cAAM,SAAS,MAAM,KAAK,gBAAgB;AAAA,UACxC;AAAA,UACA;AAAA,QACF;AACA,8BAAsB,UAAU;AAAA,MAClC,QAAQ;AACN,8BAAsB;AAAA,MACxB;AACA,iBAAW,IAAI,SAAS,cAAc,QAAQ;AAAA,IAChD;AAEA,4BAAa,KAAK;AAElB,4DACE,KAAK,2CAA2C;AAElD,wCAAmB,oBAAoB,KAAK,cAAc;AAE1D,QAAI;AACF,oDAAwB,MAAM,KAAK,wBAAwB;AAAA,IAC7D,SAAS,GAAG;AACV,cAAQ,MAAM,CAAC;AACf,oDAAwB;AAAA,IAC1B;AAEA,UAAM,qBAAqB,MAAM,4BAA4B;AAAA,MAC3D;AAAA,MACA;AAAA,MACA;AAAA,MACA,sBAAsB,KAAK,mBAAmB;AAAA,QAC5C;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,iCAAiC,KAAK,kBAAkB;AAAA,QACtD;AAAA,QACA,GAAG,cAAc;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA,UAAU,KAAK;AAAA,MACf;AAAA,IACF,CAAC;AAED,QAAI,mBAAmB;AACrB,WAAK,OAAO,CAAC,UAAU;AACrB,cAAM,kBAAkB,mBAAmB;AAC3C,cAAM,4BACJ,mBAAmB;AACrB,cAAM,kBAAkB,mBAAmB;AAC3C,cAAM,6BAAN,MAAM,2BAA6B,CAAC;AACpC,cAAM,yBAAyB,MAAM,cAAc,CAAC,IAAI;AAAA,UACtD,iBAAiB,mBAAmB;AAAA,UACpC,2BACE,mBAAmB;AAAA,UACrB,iBAAiB,mBAAmB;AAAA,QACtC;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,iBAAiB,WAAmB;AAClC,SAAK,WAAW,OAAO,SAAS;AAChC,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,WAAK,YAAY;AAAA,IACnB;AAAA,EACF;AAAA,EAEA,cAAc;AACZ,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AACA,SAAK,WAAW,MAAM;AACtB,SAAK,WAAW;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOS,UAAU;AACjB,UAAM,QAAQ;AACd,SAAK,YAAY;AAAA,EACnB;AAAA,EAEQ,QAAQ;AACd,QAAI,KAAK,YAAY;AACnB,oBAAc,KAAK,UAAU;AAAA,IAC/B;AAEA,SAAK,aAAa,YAAY,YAAY;AACxC,YAAM,cAAc,MAAM,KAAK,yBAAyB,CAAC;AAAA,IAC3D,GAAG,KAAK,aAAa;AAAA,EACvB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,aAAa,iBAAwC;AACzD,UAAM,KAAK,yBAAyB,EAAE,gBAAgB,CAAC;AAAA,EACzD;AAAA,EAEQ,aAAa;AACnB,SAAK,OAAO,MAAM;AAChB,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA,EAEA,MAAc,0BAA0B;AACtC,UAAM,oCACJ,MAAM,KAAK,sCAAsC;AACnD,UAAM,oCACJ,KAAK,wCAAwC,KAAK;AAEpD,WACE,qCAAqC;AAAA,EAEzC;AAAA,EAEA,gBACE,sBACA,cACmD;AACnD,QACE,CAAC,KAAK,MAAM,mBACZ,KAAK,MAAM,oBAAoB,mBAAmB,YAClD;AACA,aAAO,CAAC;AAAA,IACV;AACA,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK,MAAM;AAAA,IACb;AAAA,EACF;AAYF;AArTE;AA2SM;AAAA,kCAA6B,eAAC,wBAAsC;AACxE,QAAM,aAAa,uBAAuB,eAAe;AAEzD,MAAI,eAAe,KAAK,gBAAgB;AACtC,SAAK,WAAW,IAAI,SAAS,mBAAK,cAAL,UAAmB;AAChD,UAAM,KAAK,aAAa;AAExB,SAAK,iBAAiB;AAAA,EACxB;AACF;AAGF,IAAO,2BAAQ;;;AC9iBf,eAAO,4BAAmD;AAAA,EACxD;AAAA,EACA;AAAA,EACA,mBAAAA;AAAA,EACA;AAAA,EACA,mCAAAC;AAAA,EACA,8BAAAC;AAAA,EACA;AAAA,EACA,0BAAAC;AAAA,EACA,uBAAAC;AAAA,EACA;AAAA,EACA;AACF,GA8BgC;AAC9B,MAAI;AACF,QAAI,qBAAqB;AACvB,UAAI;AACJ,UAAI;AACF,oBAAY,MAAMJ,mBAAkB,sBAAsB,QAAQ;AAAA,MACpE,QAAQ;AACN,oBAAY,MAAMC,mCAAkC,QAAQ;AAAA,MAC9D;AACA,YAAM,EAAE,+BAA+B,sBAAsB,IAC3D,UAAU;AACZ,YAAM,4BAA4BG;AAAA,QAChC;AAAA,QACA;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB;AAAA,QACA,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,WAAW,0BAA0B;AACnC,YAAM,YAAY,MAAMF;AAAA,QACtB;AAAA,QACA;AAAA,MACF;AACA,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF;AACA,UAAM,IAAI,MAAM,oDAAoD;AAAA,EACtE,QAAQ;AACN,QAAI;AACF,YAAM,YAAY,MAAMC,0BAAyB,QAAQ;AACzD,aAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,2BAA2B,CAAC;AAAA,QAC5B,iBAAiB,mBAAmB;AAAA,MACtC;AAAA,IACF,SAAS,OAAO;AACd,UAAI,iBAAiB,OAAO;AAC1B,cAAM,IAAI;AAAA,UACR,6CAA6C,MAAM,OAAO;AAAA,QAC5D;AAAA,MACF;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF","sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport fetchGasEstimatesViaEthFeeHistory from './fetchGasEstimatesViaEthFeeHistory';\nimport {\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n} from './gas-util';\n\nexport const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId & SingleChainGasFeeState;\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for\n   * testing purposes.\n   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,\n    EIP1559APIEndpoint,\n    clientId,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    legacyAPIEndpoint?: string;\n    EIP1559APIEndpoint: string;\n    clientId?: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = EIP1559APIEndpoint;\n    this.legacyAPIEndpoint = legacyAPIEndpoint;\n    this.clientId = clientId;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchGasEstimatesViaEthFeeHistory,\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n    });\n\n    if (shouldUpdateState) {\n      this.update((state) => {\n        state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n        state.estimatedGasFeeTimeBounds =\n          gasFeeCalculations.estimatedGasFeeTimeBounds;\n        state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[toHex(decimalChainId)] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchGasEstimatesViaEthFeeHistory - A function that fetches gas estimates using\n * `eth_feeHistory` (an EIP-1559 feature).\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations({\n  isEIP1559Compatible,\n  isLegacyGasAPICompatible,\n  fetchGasEstimates,\n  fetchGasEstimatesUrl,\n  fetchGasEstimatesViaEthFeeHistory,\n  fetchLegacyGasPriceEstimates,\n  fetchLegacyGasPriceEstimatesUrl,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n  clientId,\n  ethQuery,\n}: {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchGasEstimatesViaEthFeeHistory: (\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    ethQuery: any,\n  ) => Promise<GasFeeEstimates>;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n}): Promise<GasFeeCalculations> {\n  try {\n    if (isEIP1559Compatible) {\n      let estimates: GasFeeEstimates;\n      try {\n        estimates = await fetchGasEstimates(fetchGasEstimatesUrl, clientId);\n      } catch {\n        estimates = await fetchGasEstimatesViaEthFeeHistory(ethQuery);\n      }\n      const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n        estimates.medium;\n      const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n        suggestedMaxPriorityFeePerGas,\n        suggestedMaxFeePerGas,\n        estimates,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds,\n        gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n      };\n    } else if (isLegacyGasAPICompatible) {\n      const estimates = await fetchLegacyGasPriceEstimates(\n        fetchLegacyGasPriceEstimatesUrl,\n        clientId,\n      );\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n      };\n    }\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    try {\n      const estimates = await fetchEthGasPriceEstimate(ethQuery);\n      return {\n        gasFeeEstimates: estimates,\n        estimatedGasFeeTimeBounds: {},\n        gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n      };\n    } catch (error) {\n      if (error instanceof Error) {\n        throw new Error(\n          `Gas fee/price estimation failed. Message: ${error.message}`,\n        );\n      }\n      throw error;\n    }\n  }\n}\n"]}
-\ No newline at end of file
-diff --git a/dist/determineGasFeeCalculations.js b/dist/determineGasFeeCalculations.js
-index 4c2cccb6b615673a89aa2335a34106eed46ca92e..efd3b433637e166ebdca72a76fb07fd049b57f9a 100644
---- a/dist/determineGasFeeCalculations.js
-+++ b/dist/determineGasFeeCalculations.js
-@@ -1,6 +1,6 @@
- "use strict";Object.defineProperty(exports, "__esModule", {value: true});
- 
--var _chunkN5BANBTWjs = require('./chunk-N5BANBTW.js');
-+var _chunkIBADKXI6js = require('./chunk-IBADKXI6.js');
- require('./chunk-EZVGDV5H.js');
- require('./chunk-5INBFZXY.js');
- require('./chunk-F46NZXRQ.js');
-@@ -10,5 +10,5 @@ require('./chunk-LO7OP5FM.js');
- require('./chunk-Z4BLTVTB.js');
- 
- 
--exports.default = _chunkN5BANBTWjs.determineGasFeeCalculations;
-+exports.default = _chunkIBADKXI6js.determineGasFeeCalculations;
- //# sourceMappingURL=determineGasFeeCalculations.js.map
-\ No newline at end of file
-diff --git a/dist/determineGasFeeCalculations.mjs b/dist/determineGasFeeCalculations.mjs
-index 62648b3e32104072a90f4a94c2b8390ebc5a0738..7b1b6485a9ae37b0011c1b2ea7ea2d0260002319 100644
---- a/dist/determineGasFeeCalculations.mjs
-+++ b/dist/determineGasFeeCalculations.mjs
-@@ -1,6 +1,6 @@
- import {
-   determineGasFeeCalculations
--} from "./chunk-4T54ULFA.mjs";
-+} from "./chunk-L45HVISM.mjs";
- import "./chunk-EXCWMMNV.mjs";
- import "./chunk-AQN4AQEF.mjs";
- import "./chunk-CCRUODGE.mjs";
-diff --git a/dist/index.js b/dist/index.js
-index 75ffb368cb40043c84c5534a8834d7a8d4ded148..6b6ba4cc47889d4191f2bc816835488f132d0ac0 100644
---- a/dist/index.js
-+++ b/dist/index.js
-@@ -2,7 +2,7 @@
- 
- 
- 
--var _chunkN5BANBTWjs = require('./chunk-N5BANBTW.js');
-+var _chunkIBADKXI6js = require('./chunk-IBADKXI6.js');
- require('./chunk-EZVGDV5H.js');
- require('./chunk-5INBFZXY.js');
- require('./chunk-F46NZXRQ.js');
-@@ -14,5 +14,5 @@ require('./chunk-Z4BLTVTB.js');
- 
- 
- 
--exports.GAS_ESTIMATE_TYPES = _chunkN5BANBTWjs.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkN5BANBTWjs.GasFeeController; exports.LEGACY_GAS_PRICES_API_URL = _chunkN5BANBTWjs.LEGACY_GAS_PRICES_API_URL;
-+exports.GAS_ESTIMATE_TYPES = _chunkIBADKXI6js.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkIBADKXI6js.GasFeeController; exports.LEGACY_GAS_PRICES_API_URL = _chunkIBADKXI6js.LEGACY_GAS_PRICES_API_URL;
- //# sourceMappingURL=index.js.map
-\ No newline at end of file
-diff --git a/dist/index.mjs b/dist/index.mjs
-index af8c3102b9230eb4e4eb7c1fdd3a19627eadeaf8..1bcc754361c9be01145c6f96438da3fc89d973ab 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -2,7 +2,7 @@ import {
-   GAS_ESTIMATE_TYPES,
-   GasFeeController,
-   LEGACY_GAS_PRICES_API_URL
--} from "./chunk-4T54ULFA.mjs";
-+} from "./chunk-L45HVISM.mjs";
- import "./chunk-EXCWMMNV.mjs";
- import "./chunk-AQN4AQEF.mjs";
- import "./chunk-CCRUODGE.mjs";
-diff --git a/dist/tsconfig.build.tsbuildinfo b/dist/tsconfig.build.tsbuildinfo
-index 3a0c1e4bc5a06afea527dcd7882f1baf27162e8f..d03af3cd1923f60769878b6942fe2947810551f1 100644
---- a/dist/tsconfig.build.tsbuildinfo
-+++ b/dist/tsconfig.build.tsbuildinfo
-@@ -1 +1 @@
--{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createProvider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/BaseControllerV1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/ts4.8/assert.d.ts","../../../node_modules/@types/node/ts4.8/assert/strict.d.ts","../../../node_modules/@types/node/ts4.8/globals.d.ts","../../../node_modules/@types/node/ts4.8/async_hooks.d.ts","../../../node_modules/@types/node/ts4.8/buffer.d.ts","../../../node_modules/@types/node/ts4.8/child_process.d.ts","../../../node_modules/@types/node/ts4.8/cluster.d.ts","../../../node_modules/@types/node/ts4.8/console.d.ts","../../../node_modules/@types/node/ts4.8/constants.d.ts","../../../node_modules/@types/node/ts4.8/crypto.d.ts","../../../node_modules/@types/node/ts4.8/dgram.d.ts","../../../node_modules/@types/node/ts4.8/diagnostics_channel.d.ts","../../../node_modules/@types/node/ts4.8/dns.d.ts","../../../node_modules/@types/node/ts4.8/dns/promises.d.ts","../../../node_modules/@types/node/ts4.8/domain.d.ts","../../../node_modules/@types/node/ts4.8/events.d.ts","../../../node_modules/@types/node/ts4.8/fs.d.ts","../../../node_modules/@types/node/ts4.8/fs/promises.d.ts","../../../node_modules/@types/node/ts4.8/http.d.ts","../../../node_modules/@types/node/ts4.8/http2.d.ts","../../../node_modules/@types/node/ts4.8/https.d.ts","../../../node_modules/@types/node/ts4.8/inspector.d.ts","../../../node_modules/@types/node/ts4.8/module.d.ts","../../../node_modules/@types/node/ts4.8/net.d.ts","../../../node_modules/@types/node/ts4.8/os.d.ts","../../../node_modules/@types/node/ts4.8/path.d.ts","../../../node_modules/@types/node/ts4.8/perf_hooks.d.ts","../../../node_modules/@types/node/ts4.8/process.d.ts","../../../node_modules/@types/node/ts4.8/punycode.d.ts","../../../node_modules/@types/node/ts4.8/querystring.d.ts","../../../node_modules/@types/node/ts4.8/readline.d.ts","../../../node_modules/@types/node/ts4.8/repl.d.ts","../../../node_modules/@types/node/ts4.8/stream.d.ts","../../../node_modules/@types/node/ts4.8/stream/promises.d.ts","../../../node_modules/@types/node/ts4.8/stream/consumers.d.ts","../../../node_modules/@types/node/ts4.8/stream/web.d.ts","../../../node_modules/@types/node/ts4.8/string_decoder.d.ts","../../../node_modules/@types/node/ts4.8/test.d.ts","../../../node_modules/@types/node/ts4.8/timers.d.ts","../../../node_modules/@types/node/ts4.8/timers/promises.d.ts","../../../node_modules/@types/node/ts4.8/tls.d.ts","../../../node_modules/@types/node/ts4.8/trace_events.d.ts","../../../node_modules/@types/node/ts4.8/tty.d.ts","../../../node_modules/@types/node/ts4.8/url.d.ts","../../../node_modules/@types/node/ts4.8/util.d.ts","../../../node_modules/@types/node/ts4.8/v8.d.ts","../../../node_modules/@types/node/ts4.8/vm.d.ts","../../../node_modules/@types/node/ts4.8/wasi.d.ts","../../../node_modules/@types/node/ts4.8/worker_threads.d.ts","../../../node_modules/@types/node/ts4.8/zlib.d.ts","../../../node_modules/@types/node/ts4.8/globals.global.d.ts","../../../node_modules/@types/node/ts4.8/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asyncEventEmitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacyTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/baseTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionFactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerClass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/RestrictedControllerMessenger.d.ts","../../base-controller/dist/types/ControllerMessenger.d.ts","../../base-controller/dist/types/BaseControllerV2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/regex.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createEventEmitterProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createSwappableProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../network-controller/dist/types/constants.d.ts","../../../node_modules/@metamask/safe-event-emitter/index.d.ts","../../json-rpc-engine/dist/types/JsonRpcEngine.d.ts","../../json-rpc-engine/dist/types/createAsyncMiddleware.d.ts","../../json-rpc-engine/dist/types/createScaffoldMiddleware.d.ts","../../json-rpc-engine/dist/types/getUniqueId.d.ts","../../json-rpc-engine/dist/types/idRemapMiddleware.d.ts","../../json-rpc-engine/dist/types/mergeMiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/eth-block-tracker/dist/BlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/PollingBlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/SubscribeBlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/index.d.ts","../../network-controller/dist/types/types.d.ts","../../network-controller/dist/types/create-auto-managed-network-client.d.ts","../../network-controller/dist/types/NetworkController.d.ts","../../network-controller/dist/types/create-network-client.d.ts","../../network-controller/dist/types/index.d.ts","../../polling-controller/dist/types/AbstractPollingController.d.ts","../../polling-controller/dist/types/BlockTrackerPollingController.d.ts","../../polling-controller/dist/types/StaticIntervalPollingController.d.ts","../../polling-controller/dist/types/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../src/determineGasFeeCalculations.ts","../src/fetchBlockFeeHistory.ts","../src/fetchGasEstimatesViaEthFeeHistory/medianOf.ts","../src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.ts","../src/fetchGasEstimatesViaEthFeeHistory/types.ts","../src/fetchGasEstimatesViaEthFeeHistory/fetchLatestBlock.ts","../src/fetchGasEstimatesViaEthFeeHistory.ts","../src/gas-util.ts","../src/GasFeeController.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupSemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/diffLines.d.ts","../../../node_modules/jest-diff/build/printDiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f20c05dbfe50a208301d2a1da37b9931bce0466eb5a1f4fe240971b4ecc82b67","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","e6b724280c694a9f588847f754198fb96c43d805f065c3a5b28bbc9594541c84","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"9b087de7268e4efc5f215347a62656663933d63c0b1d7b624913240367b999ea","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"0d5f52b3174bee6edb81260ebcd792692c32c81fd55499d69531496f3f2b25e7","affectsGlobalScope":true},{"version":"55f400eec64d17e888e278f4def2f254b41b89515d3b88ad75d5e05f019daddd","affectsGlobalScope":true},{"version":"181f1784c6c10b751631b24ce60c7f78b20665db4550b335be179217bacc0d5f","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"75ec0bdd727d887f1b79ed6619412ea72ba3c81d92d0787ccb64bab18d261f14","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"775d9c9fd150d5de79e0450f35bc8b8f94ae64e3eb5da12725ff2a649dccc777","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","869b0f507115c42896d917642f821752e8a84827bfe9ed74c23d76fb0c64c681","e475453e7140e95542332943d3052fe4c7430ad1efce42b3e9157f1fee8cbc5f","ebfdf904255ce746c9d30117c2edef355fb19bf7650478d2405f39f0e4f302e6","f3f63b48addb8e2ea9d20bb671c3c306413b3daa39996d0ae52f63d8e32158e1","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","b4000a0a525fa921e896cbdb32ae802c9684f0fd371b5fc69e7310f7918cc2c3","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","affb9dc7079c3a3522e046c5dc1325950a843b1ebd7dc0f0386aeb2397b9f0db","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","34693fb4a5e771e11668219221344dd1bd7d8b77ed005a1c1d965fb559be8406","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"8c61d5fc50490af59daf69c4e601cc76de260ee5b2ff057d608a78d6acb0b61a","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"a7289d79eb84a59d2475b4d0136b4404be3cfdd17c3ea46b9194add1d645df01","affectsGlobalScope":true},"0bb26fa2a90ee890eed57ee812c71fa84d3d07850163ec4a204de86412cc57c1","132ca47da601c60141dd6f10bd08c70d0620177e5638439df2464ec3945b6d98",{"version":"55d2bbae076fed7269c3e16faeb32f988f558427b7a1c3bf04aa7551ab86ae90","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","543c6e3a2353e9ad08b4090e1fb88a95cefb756d0d173b6ec045d7dc70a79964","3a41ebe7f089d50f447466b35b6cabb8b584c0994fc9809d0cd0a4ebc41e1239","f5350b93f10178838c23b3a81f3791d839bc44d1a2a89edb60069250fab90899","aa07f7230bcc5733919c941753d067cb8816dcad6651edb815cb302ae8ddd931","649ba4638a25c54a18dffe37367c6b7848a0bca53fa42fbbd7300b0c61aa861c","5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"a34d65f61ec5aac5b53502c8b0bd4e00d217bccb95bf94d449e2571baa11fb8c","affectsGlobalScope":true},"8d42e5af5fb0a96a77e135ce84cc60636c9bad39d9dba043a4efe9d1bdeb3cc3","56fcc451e9065eb121c9cc4c1b9994a816306f3b0b3b1fce7ad59f0ac97a9999","d4a13a5a2e6df8ef02a84ac6fd5bad4a1ec54fdef47f33250da386ea6d5c1864","c3759b5bc5cc40f5988d86a497741a80fa91258629ae50a2b3735e774cd377cc","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","45dd82fb5aea9b12b2a90b427b28f3a014e8b2ee9b74087a5ab882841cb5fbc5",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"48b2f9302651eb31acd5be69bb4e6b35797a7fcd6b77391d10a4ccadf7dc3609","605bed8af3052e790865a35e3d538a5447764a4ff01989c0f6b084a96f40e1cb","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"2db274de1088f268805043df72e21258eae845e6418dada65331d2898998f330","affectsGlobalScope":true},{"version":"2923dee3c897f03e91b54a210cdbefea7290562f0ac4b948667d4c9ee844b79e","affectsGlobalScope":true},"79169698d09a2be54b14f3bcad2575b414bf3525063fde0a1e4fcd5d6efd380e","051d939bcf77caa3cef3282708ab3a6fdfb741a7366e1d74a9e7603b67417ec3","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","f6877afc4b9d0b72e15378b187492a6547e48783980e9ff1301163b7b1c15b2e","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","09ed02a725db002693236b6dfc49b2c6eb5557be1421d7fbe4f07cfe38211d92","09d801ff4a303d4976d4b9cb94af3a9097c4a70345e662d176975872d2998e51","c8558b01389b5f7610ac293aa612ccea2ae64d83af43b49f8142f190be1f414c","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"b10b426c56e220b5093bf8a2446ee47af47263b7b1a03f4b18e42326b231b111","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b4635ef36bee17e1304337d591c3b6b461ecdbc1876d0effbe6a581e62201fe5","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"e4507242542bd499238f693d88b2d32e22177cc508854625f87bcc9bc3fa1256","affectsGlobalScope":true},{"version":"d942354e4966a98d3a92d1b1af0b4ac06f33af3f88116743e2c304c027ca26ef","affectsGlobalScope":true},"39f0808e5be3cb38674726c21fe2eb453c55e48a901679b4ce30fef85549b892","6afd66a7432ef100027ea110449e874196381e019e30eda7e7d8ca390366b7a8","befb8a9a78ac99d8fbc3ed392810489a7b90760c7a58934e8f1c8538f581cff3","e670bdf01540d35c170fae68edfd2f288eff909936780c379d6a9103b787b22c","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"e3685a8957b4e2af64c3f04a58289ee0858a649dbcd963a2b897fe85858ae18a","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","3140d587067e55ce4028275cf71b40a3fd431863ad148efc3106af84a0794cf9","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","55fcfa6909a227963d5ad3d59ea9f99480106ebd9c69d87fce8a66f8f66e23c3","7f03c7ae3f6cedb6d9261d31d0fb518d940fb2f1b8d2b02b306c6d4b7e1bc8aa","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","b59e5a5f93b7bbf729cacd0bc86106498e58f07114868350265a3de3598312c7","7c1b05262a4623e5d2a5832433582e0d6b453a3db8aa799b98f38d105812296f","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","530fb1c53338ac6618f8b8c4aa30acf89a9fe13b2bf92184ad966c824350d827","c1e87ae9c6982a1628be91d9f3a52ec5a73ed1a6d42e4e8119bf96c453b14cc0","161a4d1342b99b095a9531e65ba773ab33df0d906d7ae9f4f39180320fe23237","722cf9592e0d42cb903e40aa725f3e8e7cde91271f6be8c318bfbd7e337ff886","6a6aaf58d8ccff1409f921c37d0eb6cec3113df483c485385af3d90414e8eb07","ac9b69620b356f5bcfbc17d6a2a0591354eade1c5febb05cb1079b30ea0094c6","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","3f450762fd7c34ed545e738abccb0af6a703572a10521643cf8fc88e3724c99c","fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","8b497c8cdd875848164f60712378fb15fbc2d625b67d29285845a51fcca57aff","0be91c7eb27de7e2b84c2caa3f89ac2c314de7e00d142c01b3baa0c88163bba4","0a0658c71cfa72984205a2f33b1e28e5e5fdbce0e4fb88186aed4e5a658065dc","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","a12eaa942232703a8a8477a2f240ad5a2c26c595012ea8f128224e77984099c4","4070c2f1c3434fcf84886e04d30d82cd650ee443e53b82b404b144175cf8741e","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","b0a1e66ed5a0e5dbcd308bccc2e8ba2aac2e17306a3e6888f74bc450c9806a9e","e09f372cbf6582b5b271ef8de9a896d7785aa353dd5f9c574714dcd41636462a","8e13478e90645f18e32db1e7d82729f9b8adf2cfe9e8bb445e6d0c3f8249aebd","d95e9b84527c1091bbccde1a213d987e3eb3c1ba0de7bfb5ee710f45107b5734","12c89d0e32758c120a569045f21cf5b77244f86792611ced8de7f86b37e77781","ccccd5387e496a2899d50ed492c6120c83b7fdfe5d4fe79c4275a79b3ff7b936","751eff4da87d06979e2a4d1d99a9bc98abf04ed569c5871c97e568a83cfff25e","b121f7725eb885a38942124e6d87ef86d650b5221368f49d0b332695d53d0c34","1ff59fddc2d63283af44fd820daff74947a3282bf11bdfb014098aed1a3a51ac","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e",{"version":"e9aa2410e8871df21f0d81fa3afaa114c3092b3bacb25765e3e955697df8cfb8","signature":"7359fe30980ad122c41f840074f7881b195cb703d609a117c8dff7f673c4cf00"},{"version":"a8087c3721ee3a254e604071e4cb70469c142850ea3f3583868a8c05681ce026","signature":"75d8a7ffa7462afb0f4920188068b6b59a1ae85f59b7dad26e8942a7b77ccdda"},{"version":"52df1d99c73edcf21259dca5ba24f1d7643cf3a4014711b47df18e6a02c8cf19","signature":"5d15fe3a984cdba90e92274faeae015371a0ba64d7d443b178e77f701111afe9"},{"version":"9c4834280d7503d03fa8014183f30846170636baab6d264341d2b87d417e418c","signature":"63650a6d250c5f2f5e0e45e99113789dd65481a6605956643f765b0114cc2ce0"},{"version":"4270f9cfd62abd8ff10374a5acec0c2649e1d4f31300fd768c4933a58643dbb5","signature":"798d424b753359c997dcffdfc70e5636749621a687fc1125d444f86a5d22a93e"},{"version":"fd76e840ad3b3f7e9bd6d25b9485dc75a68b210c80f0ee034d4e27775114ba5f","signature":"d18efa93b91f45a1f26b97a23ae82670d8a80a91401f929826c4b5836973801e"},{"version":"b7ece87fafd76aebf93a0b670486851917d4d9ae981486286c231d6e6dc05428","signature":"67590c11008841bf8544396a16000a10b5687394d7caf5d2b5f60f8de9fac20b"},{"version":"15433a2e97dcee760d97f8e56afe908fe932611ef00711aed9b246ba058ce0be","signature":"c5fc52cba80e6ba6fde33b0f9370b8ba6866831070cbc84b20a7c6e9e1163160"},{"version":"8fab09703e473038c5b990ae1785dc9556b6dddb70694de55cc39f661c6ca7bd","signature":"c0e1493caaab115c737b9ef6f4d37b7d2962a1bf16a18b602f882c9a0a4b01ef"},"d021f18758b28bda32bdaf0a987e0804cec074a9a4cfab8232ed81d96e75dfae","a5aaeca001d2f69093d04aac4db321e4c338fd9b20cbc4f0b0af3dc6ae0f235b","cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","29a46d003ca3c721e6405f00dee7e3de91b14e09701eba5d887bf76fb2d47d38","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","9990f9e566bc3c2c6e38df81294fb756e7f5b7b0e5bb17ab75384e190548b4b6",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","df95e00612c1faa5e0e7ef0dba589b18665bbeb3221db2b6cee1fe4d0e61921f","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","675e702f2032766a91eeadee64f51014c64688525da99dccd8178f0c599f13a8","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","19c816167e076e7c24f074389c6cf3ed87bdbb917d1ea439ca281f9d26db2439","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","98f9d826db9cd99d27a01a59ee5f22863df00ccf1aaf43e1d7db80ebf716f7c3","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","dcd91d3b697cb650b95db5471189b99815af5db2a1cd28760f91e0b12ede8ed5","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","3cf0d343c2276842a5b617f22ba82af6322c7cfe8bb52238ffc0c491a3c21019","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9",{"version":"f2eff8704452659641164876c1ef0df4174659ce7311b0665798ea3f556fa9ad","affectsGlobalScope":true},"8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","2b8264b2fefd7367e0f20e2c04eed5d3038831fe00f5efbc110ff0131aab899b","a73a445c1e0a6d0f8b48e8eb22dc9d647896783a7f8991cbbc31c0d94bf1f5a2","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","cd1d2f103b79002cd94b85a640a103f094227a2c4c53bc8af1fdbf4e13d9729e","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","3dce33e7eb25594863b8e615f14a45ab98190d85953436750644212d8a18c066","2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","f83b320cceccfc48457a818d18fc9a006ab18d0bdd727aa2c2e73dc1b4a45e98","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","ed44ba6b95f08b758748be7902e0cc54178b1337c56d0e2469c77b03f63ac73b"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[119,238],[119],[90,119,126,127,128,143],[119,127,128,144,145],[119,126,127],[119,126,143,146,149],[119,126,146,149,150],[119,147,148,149,151,152],[119,126,149],[119,126,143,146,147,148,151],[119,126,134],[119,126],[90,119,126],[79,119,126],[119,130,131,132,133,134,135,136,137,138,139,140,141,142],[119,126,132,133],[119,126,132,134],[119,197],[119,197,198,199],[63,119],[66,119],[63,66,119],[64,65,66,67,68,69,70,71,72,73,74,119,154,157,158,159,160,161,162,163,164],[57,63,64,119],[66,72,74,119,153],[119,156],[66,67,119],[63,119,160],[119,192,193],[119,238,239,240,241,242],[119,238,240],[119,155],[119,245,246,247],[91,119,126],[119,250],[119,251],[119,262],[119,256,261],[119,265,267,268,269,270,271,272,273,274,275,276,277],[119,265,266,268,269,270,271,272,273,274,275,276,277],[119,266,267,268,269,270,271,272,273,274,275,276,277],[119,265,266,267,269,270,271,272,273,274,275,276,277],[119,265,266,267,268,270,271,272,273,274,275,276,277],[119,265,266,267,268,269,271,272,273,274,275,276,277],[119,265,266,267,268,269,270,272,273,274,275,276,277],[119,265,266,267,268,269,270,271,273,274,275,276,277],[119,265,266,267,268,269,270,271,272,274,275,276,277],[119,265,266,267,268,269,270,271,272,273,275,276,277],[119,265,266,267,268,269,270,271,272,273,274,276,277],[119,265,266,267,268,269,270,271,272,273,274,275,277],[119,265,266,267,268,269,270,271,272,273,274,275,276],[75,119],[78,119],[79,84,110,119],[80,90,91,98,107,118,119],[80,81,90,98,119],[82,119],[83,84,91,99,119],[84,107,115,119],[85,87,90,98,119],[86,119],[87,88,119],[89,90,119],[90,119],[90,91,92,107,118,119],[90,91,92,107,119],[93,98,107,118,119],[90,91,93,94,98,107,115,118,119],[93,95,107,115,118,119],[75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125],[90,96,119],[97,118,119,123],[87,90,98,107,119],[99,119],[100,119],[78,101,119],[102,117,119,123],[103,119],[104,119],[90,105,119],[105,106,119,121],[79,90,107,108,109,119],[79,107,109,119],[107,108,119],[110,119],[111,119],[90,113,114,119],[113,114,119],[84,98,115,119],[116,119],[98,117,119],[79,93,104,118,119],[84,119],[107,119,120],[119,121],[119,122],[79,84,90,92,101,107,118,119,121,123],[107,119,124],[119,126,283],[119,286,325],[119,286,310,325],[119,325],[119,286],[119,286,311,325],[119,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324],[119,311,325],[119,326],[119,329],[119,202],[119,202,213,214],[119,214,215,216],[119,177],[119,177,178,179,180,181],[119,166,167,168,169,170,171,172,173,174,175,176],[119,254,257],[119,254,257,258,259],[119,256],[119,253,260],[119,255],[56,58,59,60,61,62,119],[56,57,119],[58,119],[57,58,119],[56,58,119],[119,165,182,183,184],[119,183],[119,184],[55,119,183,184,185],[119,187],[119,187,188,191,195],[119,194],[119,165,189,190],[119,210,211,212],[119,209,210],[119,165,209,210],[119,165,202,209],[119,165,186,189,196,222,226,227,228,234,235],[119,236],[119,190,196],[50,119,189,196,229,231,233,236],[50,119,190,196,229,230,236],[119,189,196,232],[119,190],[119,189,190,196,236],[119,165,202],[119,165,203],[119,203,204,205,206,207,208],[119,165,186,189,196,200,201,218,219],[119,218],[119,201,218,220,221],[119,165,196,213,217],[119,165,222],[119,165,186,222,223],[119,126,165,186,222,223],[119,223,224,225],[165,186,222,226],[236],[190],[189,236],[229,236],[189,232]],"referencedMap":[[240,1],[238,2],[144,3],[127,2],[146,4],[128,5],[145,2],[150,6],[151,7],[147,7],[153,8],[148,7],[152,9],[149,10],[135,11],[132,12],[139,13],[133,11],[130,14],[138,2],[143,15],[140,2],[141,2],[142,2],[137,12],[134,16],[131,2],[136,17],[189,2],[202,13],[198,18],[199,18],[200,19],[197,2],[64,20],[65,20],[67,21],[68,20],[69,20],[70,22],[71,2],[72,2],[73,2],[66,20],[165,23],[74,24],[154,25],[157,26],[158,2],[159,2],[160,2],[161,2],[162,2],[163,27],[164,28],[192,2],[194,29],[193,2],[243,30],[239,1],[241,31],[242,1],[190,12],[156,32],[244,2],[245,2],[248,33],[246,2],[249,34],[250,2],[251,35],[252,36],[263,37],[262,38],[247,2],[264,2],[266,39],[267,40],[265,41],[268,42],[269,43],[270,44],[271,45],[272,46],[273,47],[274,48],[275,49],[276,50],[277,51],[278,2],[155,2],[75,52],[76,52],[78,53],[79,54],[80,55],[81,56],[82,57],[83,58],[84,59],[85,60],[86,61],[87,62],[88,62],[89,63],[90,64],[91,65],[92,66],[77,2],[125,2],[93,67],[94,68],[95,69],[126,70],[96,71],[97,72],[98,73],[99,74],[100,75],[101,76],[102,77],[103,78],[104,79],[105,80],[106,81],[107,82],[109,83],[108,84],[110,85],[111,86],[112,2],[113,87],[114,88],[115,89],[116,90],[117,91],[118,92],[119,93],[120,94],[121,95],[122,96],[123,97],[124,98],[279,2],[280,12],[281,2],[282,2],[284,99],[283,2],[285,12],[310,100],[311,101],[286,102],[289,102],[308,100],[309,100],[299,100],[298,103],[296,100],[291,100],[304,100],[302,100],[306,100],[290,100],[303,100],[307,100],[292,100],[293,100],[305,100],[287,100],[294,100],[295,100],[297,100],[301,100],[312,104],[300,100],[288,100],[325,105],[324,2],[319,104],[321,106],[320,104],[313,104],[314,104],[316,104],[318,104],[322,106],[323,106],[315,106],[317,106],[327,107],[326,2],[328,2],[227,2],[329,2],[330,108],[129,2],[253,2],[214,109],[215,110],[216,110],[217,111],[176,2],[173,112],[175,112],[174,112],[172,112],[182,113],[177,114],[181,2],[178,2],[180,2],[179,2],[168,112],[169,112],[170,112],[166,2],[167,2],[171,112],[254,2],[258,115],[260,116],[259,115],[257,117],[261,118],[256,119],[255,2],[56,2],[63,120],[58,121],[59,122],[60,122],[61,123],[62,123],[57,124],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[30,2],[31,2],[32,2],[33,2],[7,2],[34,2],[39,2],[40,2],[35,2],[36,2],[37,2],[38,2],[1,2],[41,2],[55,2],[185,125],[184,126],[183,127],[186,128],[188,129],[196,130],[195,131],[187,2],[191,132],[213,133],[211,134],[212,135],[210,136],[236,137],[228,138],[229,139],[234,140],[231,141],[233,142],[230,143],[232,143],[235,144],[237,138],[203,145],[204,146],[205,146],[206,2],[207,146],[209,147],[208,146],[220,148],[201,2],[219,149],[221,149],[222,150],[218,151],[223,152],[224,153],[225,154],[226,155],[46,2],[47,2],[48,2],[49,2],[50,2],[51,2],[42,2],[52,2],[53,2],[54,2],[43,2],[44,2],[45,2]],"exportedModulesMap":[[240,1],[238,2],[144,3],[127,2],[146,4],[128,5],[145,2],[150,6],[151,7],[147,7],[153,8],[148,7],[152,9],[149,10],[135,11],[132,12],[139,13],[133,11],[130,14],[138,2],[143,15],[140,2],[141,2],[142,2],[137,12],[134,16],[131,2],[136,17],[189,2],[202,13],[198,18],[199,18],[200,19],[197,2],[64,20],[65,20],[67,21],[68,20],[69,20],[70,22],[71,2],[72,2],[73,2],[66,20],[165,23],[74,24],[154,25],[157,26],[158,2],[159,2],[160,2],[161,2],[162,2],[163,27],[164,28],[192,2],[194,29],[193,2],[243,30],[239,1],[241,31],[242,1],[190,12],[156,32],[244,2],[245,2],[248,33],[246,2],[249,34],[250,2],[251,35],[252,36],[263,37],[262,38],[247,2],[264,2],[266,39],[267,40],[265,41],[268,42],[269,43],[270,44],[271,45],[272,46],[273,47],[274,48],[275,49],[276,50],[277,51],[278,2],[155,2],[75,52],[76,52],[78,53],[79,54],[80,55],[81,56],[82,57],[83,58],[84,59],[85,60],[86,61],[87,62],[88,62],[89,63],[90,64],[91,65],[92,66],[77,2],[125,2],[93,67],[94,68],[95,69],[126,70],[96,71],[97,72],[98,73],[99,74],[100,75],[101,76],[102,77],[103,78],[104,79],[105,80],[106,81],[107,82],[109,83],[108,84],[110,85],[111,86],[112,2],[113,87],[114,88],[115,89],[116,90],[117,91],[118,92],[119,93],[120,94],[121,95],[122,96],[123,97],[124,98],[279,2],[280,12],[281,2],[282,2],[284,99],[283,2],[285,12],[310,100],[311,101],[286,102],[289,102],[308,100],[309,100],[299,100],[298,103],[296,100],[291,100],[304,100],[302,100],[306,100],[290,100],[303,100],[307,100],[292,100],[293,100],[305,100],[287,100],[294,100],[295,100],[297,100],[301,100],[312,104],[300,100],[288,100],[325,105],[324,2],[319,104],[321,106],[320,104],[313,104],[314,104],[316,104],[318,104],[322,106],[323,106],[315,106],[317,106],[327,107],[326,2],[328,2],[227,2],[329,2],[330,108],[129,2],[253,2],[214,109],[215,110],[216,110],[217,111],[176,2],[173,112],[175,112],[174,112],[172,112],[182,113],[177,114],[181,2],[178,2],[180,2],[179,2],[168,112],[169,112],[170,112],[166,2],[167,2],[171,112],[254,2],[258,115],[260,116],[259,115],[257,117],[261,118],[256,119],[255,2],[56,2],[63,120],[58,121],[59,122],[60,122],[61,123],[62,123],[57,124],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[30,2],[31,2],[32,2],[33,2],[7,2],[34,2],[39,2],[40,2],[35,2],[36,2],[37,2],[38,2],[1,2],[41,2],[55,2],[185,125],[184,126],[183,127],[186,128],[188,129],[196,130],[195,131],[187,2],[191,132],[213,133],[211,134],[212,135],[210,136],[236,156],[228,157],[229,158],[234,159],[231,160],[233,161],[230,158],[232,158],[235,159],[237,138],[203,145],[204,146],[205,146],[206,2],[207,146],[209,147],[208,146],[220,148],[201,2],[219,149],[221,149],[222,150],[218,151],[223,152],[224,153],[225,154],[226,155],[46,2],[47,2],[48,2],[49,2],[50,2],[51,2],[42,2],[52,2],[53,2],[54,2],[43,2],[44,2],[45,2]],"semanticDiagnosticsPerFile":[240,238,144,127,146,128,145,150,151,147,153,148,152,149,135,132,139,133,130,138,143,140,141,142,137,134,131,136,189,202,198,199,200,197,64,65,67,68,69,70,71,72,73,66,165,74,154,157,158,159,160,161,162,163,164,192,194,193,243,239,241,242,190,156,244,245,248,246,249,250,251,252,263,262,247,264,266,267,265,268,269,270,271,272,273,274,275,276,277,278,155,75,76,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,77,125,93,94,95,126,96,97,98,99,100,101,102,103,104,105,106,107,109,108,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,279,280,281,282,284,283,285,310,311,286,289,308,309,299,298,296,291,304,302,306,290,303,307,292,293,305,287,294,295,297,301,312,300,288,325,324,319,321,320,313,314,316,318,322,323,315,317,327,326,328,227,329,330,129,253,214,215,216,217,176,173,175,174,172,182,177,181,178,180,179,168,169,170,166,167,171,254,258,260,259,257,261,256,255,56,63,58,59,60,61,62,57,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,30,31,32,33,7,34,39,40,35,36,37,38,1,41,55,185,184,183,186,188,196,195,187,191,213,211,212,210,236,228,229,234,231,233,230,232,235,237,203,204,205,206,207,209,208,220,201,219,221,222,218,223,224,225,226,46,47,48,49,50,51,42,52,53,54,43,44,45],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.8.4"}
-\ No newline at end of file
-+{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createprovider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/basecontrollerv1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/ts4.8/assert.d.ts","../../../node_modules/@types/node/ts4.8/assert/strict.d.ts","../../../node_modules/@types/node/ts4.8/globals.d.ts","../../../node_modules/@types/node/ts4.8/async_hooks.d.ts","../../../node_modules/@types/node/ts4.8/buffer.d.ts","../../../node_modules/@types/node/ts4.8/child_process.d.ts","../../../node_modules/@types/node/ts4.8/cluster.d.ts","../../../node_modules/@types/node/ts4.8/console.d.ts","../../../node_modules/@types/node/ts4.8/constants.d.ts","../../../node_modules/@types/node/ts4.8/crypto.d.ts","../../../node_modules/@types/node/ts4.8/dgram.d.ts","../../../node_modules/@types/node/ts4.8/diagnostics_channel.d.ts","../../../node_modules/@types/node/ts4.8/dns.d.ts","../../../node_modules/@types/node/ts4.8/dns/promises.d.ts","../../../node_modules/@types/node/ts4.8/domain.d.ts","../../../node_modules/@types/node/ts4.8/events.d.ts","../../../node_modules/@types/node/ts4.8/fs.d.ts","../../../node_modules/@types/node/ts4.8/fs/promises.d.ts","../../../node_modules/@types/node/ts4.8/http.d.ts","../../../node_modules/@types/node/ts4.8/http2.d.ts","../../../node_modules/@types/node/ts4.8/https.d.ts","../../../node_modules/@types/node/ts4.8/inspector.d.ts","../../../node_modules/@types/node/ts4.8/module.d.ts","../../../node_modules/@types/node/ts4.8/net.d.ts","../../../node_modules/@types/node/ts4.8/os.d.ts","../../../node_modules/@types/node/ts4.8/path.d.ts","../../../node_modules/@types/node/ts4.8/perf_hooks.d.ts","../../../node_modules/@types/node/ts4.8/process.d.ts","../../../node_modules/@types/node/ts4.8/punycode.d.ts","../../../node_modules/@types/node/ts4.8/querystring.d.ts","../../../node_modules/@types/node/ts4.8/readline.d.ts","../../../node_modules/@types/node/ts4.8/repl.d.ts","../../../node_modules/@types/node/ts4.8/stream.d.ts","../../../node_modules/@types/node/ts4.8/stream/promises.d.ts","../../../node_modules/@types/node/ts4.8/stream/consumers.d.ts","../../../node_modules/@types/node/ts4.8/stream/web.d.ts","../../../node_modules/@types/node/ts4.8/string_decoder.d.ts","../../../node_modules/@types/node/ts4.8/test.d.ts","../../../node_modules/@types/node/ts4.8/timers.d.ts","../../../node_modules/@types/node/ts4.8/timers/promises.d.ts","../../../node_modules/@types/node/ts4.8/tls.d.ts","../../../node_modules/@types/node/ts4.8/trace_events.d.ts","../../../node_modules/@types/node/ts4.8/tty.d.ts","../../../node_modules/@types/node/ts4.8/url.d.ts","../../../node_modules/@types/node/ts4.8/util.d.ts","../../../node_modules/@types/node/ts4.8/v8.d.ts","../../../node_modules/@types/node/ts4.8/vm.d.ts","../../../node_modules/@types/node/ts4.8/wasi.d.ts","../../../node_modules/@types/node/ts4.8/worker_threads.d.ts","../../../node_modules/@types/node/ts4.8/zlib.d.ts","../../../node_modules/@types/node/ts4.8/globals.global.d.ts","../../../node_modules/@types/node/ts4.8/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asynceventemitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacytransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/basetransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionfactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerclass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/restrictedcontrollermessenger.d.ts","../../base-controller/dist/types/controllermessenger.d.ts","../../base-controller/dist/types/basecontrollerv2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/regex.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createeventemitterproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createswappableproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../network-controller/dist/types/constants.d.ts","../../../node_modules/@metamask/safe-event-emitter/index.d.ts","../../json-rpc-engine/dist/types/jsonrpcengine.d.ts","../../json-rpc-engine/dist/types/createasyncmiddleware.d.ts","../../json-rpc-engine/dist/types/createscaffoldmiddleware.d.ts","../../json-rpc-engine/dist/types/getuniqueid.d.ts","../../json-rpc-engine/dist/types/idremapmiddleware.d.ts","../../json-rpc-engine/dist/types/mergemiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/eth-block-tracker/dist/blocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/pollingblocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/subscribeblocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/index.d.ts","../../network-controller/dist/types/types.d.ts","../../network-controller/dist/types/create-auto-managed-network-client.d.ts","../../network-controller/dist/types/networkcontroller.d.ts","../../network-controller/dist/types/create-network-client.d.ts","../../network-controller/dist/types/index.d.ts","../../polling-controller/dist/types/abstractpollingcontroller.d.ts","../../polling-controller/dist/types/blocktrackerpollingcontroller.d.ts","../../polling-controller/dist/types/staticintervalpollingcontroller.d.ts","../../polling-controller/dist/types/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../src/determinegasfeecalculations.ts","../src/fetchblockfeehistory.ts","../src/fetchgasestimatesviaethfeehistory/medianof.ts","../src/fetchgasestimatesviaethfeehistory/calculategasfeeestimatesforprioritylevels.ts","../src/fetchgasestimatesviaethfeehistory/types.ts","../src/fetchgasestimatesviaethfeehistory/fetchlatestblock.ts","../src/fetchgasestimatesviaethfeehistory.ts","../src/gas-util.ts","../src/gasfeecontroller.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupsemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/difflines.d.ts","../../../node_modules/jest-diff/build/printdiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f20c05dbfe50a208301d2a1da37b9931bce0466eb5a1f4fe240971b4ecc82b67","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","e6b724280c694a9f588847f754198fb96c43d805f065c3a5b28bbc9594541c84","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"9b087de7268e4efc5f215347a62656663933d63c0b1d7b624913240367b999ea","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"0d5f52b3174bee6edb81260ebcd792692c32c81fd55499d69531496f3f2b25e7","affectsGlobalScope":true},{"version":"55f400eec64d17e888e278f4def2f254b41b89515d3b88ad75d5e05f019daddd","affectsGlobalScope":true},{"version":"181f1784c6c10b751631b24ce60c7f78b20665db4550b335be179217bacc0d5f","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"75ec0bdd727d887f1b79ed6619412ea72ba3c81d92d0787ccb64bab18d261f14","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"775d9c9fd150d5de79e0450f35bc8b8f94ae64e3eb5da12725ff2a649dccc777","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","869b0f507115c42896d917642f821752e8a84827bfe9ed74c23d76fb0c64c681","e475453e7140e95542332943d3052fe4c7430ad1efce42b3e9157f1fee8cbc5f","ebfdf904255ce746c9d30117c2edef355fb19bf7650478d2405f39f0e4f302e6","f3f63b48addb8e2ea9d20bb671c3c306413b3daa39996d0ae52f63d8e32158e1","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","b4000a0a525fa921e896cbdb32ae802c9684f0fd371b5fc69e7310f7918cc2c3","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","affb9dc7079c3a3522e046c5dc1325950a843b1ebd7dc0f0386aeb2397b9f0db","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","34693fb4a5e771e11668219221344dd1bd7d8b77ed005a1c1d965fb559be8406","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"8c61d5fc50490af59daf69c4e601cc76de260ee5b2ff057d608a78d6acb0b61a","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"a7289d79eb84a59d2475b4d0136b4404be3cfdd17c3ea46b9194add1d645df01","affectsGlobalScope":true},"0bb26fa2a90ee890eed57ee812c71fa84d3d07850163ec4a204de86412cc57c1","132ca47da601c60141dd6f10bd08c70d0620177e5638439df2464ec3945b6d98",{"version":"55d2bbae076fed7269c3e16faeb32f988f558427b7a1c3bf04aa7551ab86ae90","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","543c6e3a2353e9ad08b4090e1fb88a95cefb756d0d173b6ec045d7dc70a79964","3a41ebe7f089d50f447466b35b6cabb8b584c0994fc9809d0cd0a4ebc41e1239","f5350b93f10178838c23b3a81f3791d839bc44d1a2a89edb60069250fab90899","aa07f7230bcc5733919c941753d067cb8816dcad6651edb815cb302ae8ddd931","649ba4638a25c54a18dffe37367c6b7848a0bca53fa42fbbd7300b0c61aa861c","5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"a34d65f61ec5aac5b53502c8b0bd4e00d217bccb95bf94d449e2571baa11fb8c","affectsGlobalScope":true},"8d42e5af5fb0a96a77e135ce84cc60636c9bad39d9dba043a4efe9d1bdeb3cc3","56fcc451e9065eb121c9cc4c1b9994a816306f3b0b3b1fce7ad59f0ac97a9999","d4a13a5a2e6df8ef02a84ac6fd5bad4a1ec54fdef47f33250da386ea6d5c1864","c3759b5bc5cc40f5988d86a497741a80fa91258629ae50a2b3735e774cd377cc","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","45dd82fb5aea9b12b2a90b427b28f3a014e8b2ee9b74087a5ab882841cb5fbc5",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"48b2f9302651eb31acd5be69bb4e6b35797a7fcd6b77391d10a4ccadf7dc3609","605bed8af3052e790865a35e3d538a5447764a4ff01989c0f6b084a96f40e1cb","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"2db274de1088f268805043df72e21258eae845e6418dada65331d2898998f330","affectsGlobalScope":true},{"version":"2923dee3c897f03e91b54a210cdbefea7290562f0ac4b948667d4c9ee844b79e","affectsGlobalScope":true},"79169698d09a2be54b14f3bcad2575b414bf3525063fde0a1e4fcd5d6efd380e","051d939bcf77caa3cef3282708ab3a6fdfb741a7366e1d74a9e7603b67417ec3","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","f6877afc4b9d0b72e15378b187492a6547e48783980e9ff1301163b7b1c15b2e","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","09ed02a725db002693236b6dfc49b2c6eb5557be1421d7fbe4f07cfe38211d92","09d801ff4a303d4976d4b9cb94af3a9097c4a70345e662d176975872d2998e51","c8558b01389b5f7610ac293aa612ccea2ae64d83af43b49f8142f190be1f414c","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"b10b426c56e220b5093bf8a2446ee47af47263b7b1a03f4b18e42326b231b111","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b4635ef36bee17e1304337d591c3b6b461ecdbc1876d0effbe6a581e62201fe5","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"e4507242542bd499238f693d88b2d32e22177cc508854625f87bcc9bc3fa1256","affectsGlobalScope":true},{"version":"d942354e4966a98d3a92d1b1af0b4ac06f33af3f88116743e2c304c027ca26ef","affectsGlobalScope":true},"39f0808e5be3cb38674726c21fe2eb453c55e48a901679b4ce30fef85549b892","6afd66a7432ef100027ea110449e874196381e019e30eda7e7d8ca390366b7a8","befb8a9a78ac99d8fbc3ed392810489a7b90760c7a58934e8f1c8538f581cff3","e670bdf01540d35c170fae68edfd2f288eff909936780c379d6a9103b787b22c","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"e3685a8957b4e2af64c3f04a58289ee0858a649dbcd963a2b897fe85858ae18a","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","3140d587067e55ce4028275cf71b40a3fd431863ad148efc3106af84a0794cf9","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","55fcfa6909a227963d5ad3d59ea9f99480106ebd9c69d87fce8a66f8f66e23c3","7f03c7ae3f6cedb6d9261d31d0fb518d940fb2f1b8d2b02b306c6d4b7e1bc8aa","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","b59e5a5f93b7bbf729cacd0bc86106498e58f07114868350265a3de3598312c7","7c1b05262a4623e5d2a5832433582e0d6b453a3db8aa799b98f38d105812296f","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","530fb1c53338ac6618f8b8c4aa30acf89a9fe13b2bf92184ad966c824350d827","c1e87ae9c6982a1628be91d9f3a52ec5a73ed1a6d42e4e8119bf96c453b14cc0","161a4d1342b99b095a9531e65ba773ab33df0d906d7ae9f4f39180320fe23237","722cf9592e0d42cb903e40aa725f3e8e7cde91271f6be8c318bfbd7e337ff886","6a6aaf58d8ccff1409f921c37d0eb6cec3113df483c485385af3d90414e8eb07","ac9b69620b356f5bcfbc17d6a2a0591354eade1c5febb05cb1079b30ea0094c6","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","3f450762fd7c34ed545e738abccb0af6a703572a10521643cf8fc88e3724c99c","fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","8b497c8cdd875848164f60712378fb15fbc2d625b67d29285845a51fcca57aff","0be91c7eb27de7e2b84c2caa3f89ac2c314de7e00d142c01b3baa0c88163bba4","0a0658c71cfa72984205a2f33b1e28e5e5fdbce0e4fb88186aed4e5a658065dc","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","a12eaa942232703a8a8477a2f240ad5a2c26c595012ea8f128224e77984099c4","4070c2f1c3434fcf84886e04d30d82cd650ee443e53b82b404b144175cf8741e","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","b0a1e66ed5a0e5dbcd308bccc2e8ba2aac2e17306a3e6888f74bc450c9806a9e","e09f372cbf6582b5b271ef8de9a896d7785aa353dd5f9c574714dcd41636462a","8e13478e90645f18e32db1e7d82729f9b8adf2cfe9e8bb445e6d0c3f8249aebd","d95e9b84527c1091bbccde1a213d987e3eb3c1ba0de7bfb5ee710f45107b5734","12c89d0e32758c120a569045f21cf5b77244f86792611ced8de7f86b37e77781","ccccd5387e496a2899d50ed492c6120c83b7fdfe5d4fe79c4275a79b3ff7b936","751eff4da87d06979e2a4d1d99a9bc98abf04ed569c5871c97e568a83cfff25e","b121f7725eb885a38942124e6d87ef86d650b5221368f49d0b332695d53d0c34","1ff59fddc2d63283af44fd820daff74947a3282bf11bdfb014098aed1a3a51ac","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e",{"version":"e9aa2410e8871df21f0d81fa3afaa114c3092b3bacb25765e3e955697df8cfb8","signature":"7359fe30980ad122c41f840074f7881b195cb703d609a117c8dff7f673c4cf00"},{"version":"a8087c3721ee3a254e604071e4cb70469c142850ea3f3583868a8c05681ce026","signature":"75d8a7ffa7462afb0f4920188068b6b59a1ae85f59b7dad26e8942a7b77ccdda"},{"version":"52df1d99c73edcf21259dca5ba24f1d7643cf3a4014711b47df18e6a02c8cf19","signature":"5d15fe3a984cdba90e92274faeae015371a0ba64d7d443b178e77f701111afe9"},{"version":"9c4834280d7503d03fa8014183f30846170636baab6d264341d2b87d417e418c","signature":"63650a6d250c5f2f5e0e45e99113789dd65481a6605956643f765b0114cc2ce0"},{"version":"4270f9cfd62abd8ff10374a5acec0c2649e1d4f31300fd768c4933a58643dbb5","signature":"798d424b753359c997dcffdfc70e5636749621a687fc1125d444f86a5d22a93e"},{"version":"fd76e840ad3b3f7e9bd6d25b9485dc75a68b210c80f0ee034d4e27775114ba5f","signature":"d18efa93b91f45a1f26b97a23ae82670d8a80a91401f929826c4b5836973801e"},{"version":"b7ece87fafd76aebf93a0b670486851917d4d9ae981486286c231d6e6dc05428","signature":"67590c11008841bf8544396a16000a10b5687394d7caf5d2b5f60f8de9fac20b"},{"version":"15433a2e97dcee760d97f8e56afe908fe932611ef00711aed9b246ba058ce0be","signature":"c5fc52cba80e6ba6fde33b0f9370b8ba6866831070cbc84b20a7c6e9e1163160"},{"version":"6e43bf5325bc6ef67cdfb48f74a77bcf99768c1230067f22c88eb7c1a7cd1784","signature":"c0e1493caaab115c737b9ef6f4d37b7d2962a1bf16a18b602f882c9a0a4b01ef"},"d021f18758b28bda32bdaf0a987e0804cec074a9a4cfab8232ed81d96e75dfae","a5aaeca001d2f69093d04aac4db321e4c338fd9b20cbc4f0b0af3dc6ae0f235b","cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","29a46d003ca3c721e6405f00dee7e3de91b14e09701eba5d887bf76fb2d47d38","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","9990f9e566bc3c2c6e38df81294fb756e7f5b7b0e5bb17ab75384e190548b4b6",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","df95e00612c1faa5e0e7ef0dba589b18665bbeb3221db2b6cee1fe4d0e61921f","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","675e702f2032766a91eeadee64f51014c64688525da99dccd8178f0c599f13a8","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","19c816167e076e7c24f074389c6cf3ed87bdbb917d1ea439ca281f9d26db2439","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","98f9d826db9cd99d27a01a59ee5f22863df00ccf1aaf43e1d7db80ebf716f7c3","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","dcd91d3b697cb650b95db5471189b99815af5db2a1cd28760f91e0b12ede8ed5","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","3cf0d343c2276842a5b617f22ba82af6322c7cfe8bb52238ffc0c491a3c21019","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9",{"version":"f2eff8704452659641164876c1ef0df4174659ce7311b0665798ea3f556fa9ad","affectsGlobalScope":true},"8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","2b8264b2fefd7367e0f20e2c04eed5d3038831fe00f5efbc110ff0131aab899b","a73a445c1e0a6d0f8b48e8eb22dc9d647896783a7f8991cbbc31c0d94bf1f5a2","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","cd1d2f103b79002cd94b85a640a103f094227a2c4c53bc8af1fdbf4e13d9729e","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","3dce33e7eb25594863b8e615f14a45ab98190d85953436750644212d8a18c066","2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","f83b320cceccfc48457a818d18fc9a006ab18d0bdd727aa2c2e73dc1b4a45e98","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","ed44ba6b95f08b758748be7902e0cc54178b1337c56d0e2469c77b03f63ac73b"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[119,238],[119],[90,119,126,127,128,143],[119,127,128,144,145],[119,126,127],[119,126,143,146,149],[119,126,146,149,150],[119,147,148,149,151,152],[119,126,149],[119,126,143,146,147,148,151],[119,126,134],[119,126],[90,119,126],[79,119,126],[119,130,131,132,133,134,135,136,137,138,139,140,141,142],[119,126,132,133],[119,126,132,134],[119,197],[119,197,198,199],[63,119],[66,119],[63,66,119],[64,65,66,67,68,69,70,71,72,73,74,119,154,157,158,159,160,161,162,163,164],[57,63,64,119],[66,72,74,119,153],[119,156],[66,67,119],[63,119,160],[119,192,193],[119,238,239,240,241,242],[119,238,240],[119,155],[119,245,246,247],[91,119,126],[119,250],[119,251],[119,262],[119,256,261],[119,265,267,268,269,270,271,272,273,274,275,276,277],[119,265,266,268,269,270,271,272,273,274,275,276,277],[119,266,267,268,269,270,271,272,273,274,275,276,277],[119,265,266,267,269,270,271,272,273,274,275,276,277],[119,265,266,267,268,270,271,272,273,274,275,276,277],[119,265,266,267,268,269,271,272,273,274,275,276,277],[119,265,266,267,268,269,270,272,273,274,275,276,277],[119,265,266,267,268,269,270,271,273,274,275,276,277],[119,265,266,267,268,269,270,271,272,274,275,276,277],[119,265,266,267,268,269,270,271,272,273,275,276,277],[119,265,266,267,268,269,270,271,272,273,274,276,277],[119,265,266,267,268,269,270,271,272,273,274,275,277],[119,265,266,267,268,269,270,271,272,273,274,275,276],[75,119],[78,119],[79,84,110,119],[80,90,91,98,107,118,119],[80,81,90,98,119],[82,119],[83,84,91,99,119],[84,107,115,119],[85,87,90,98,119],[86,119],[87,88,119],[89,90,119],[90,119],[90,91,92,107,118,119],[90,91,92,107,119],[93,98,107,118,119],[90,91,93,94,98,107,115,118,119],[93,95,107,115,118,119],[75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125],[90,96,119],[97,118,119,123],[87,90,98,107,119],[99,119],[100,119],[78,101,119],[102,117,119,123],[103,119],[104,119],[90,105,119],[105,106,119,121],[79,90,107,108,109,119],[79,107,109,119],[107,108,119],[110,119],[111,119],[90,113,114,119],[113,114,119],[84,98,115,119],[116,119],[98,117,119],[79,93,104,118,119],[84,119],[107,119,120],[119,121],[119,122],[79,84,90,92,101,107,118,119,121,123],[107,119,124],[119,126,283],[119,286,325],[119,286,310,325],[119,325],[119,286],[119,286,311,325],[119,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324],[119,311,325],[119,326],[119,329],[119,202],[119,214,215,216],[119,202,213,214],[119,177],[119,177,178,179,180,181],[119,166,167,168,169,170,171,172,173,174,175,176],[119,254,257],[119,254,257,258,259],[119,256],[119,253,260],[119,255],[56,58,59,60,61,62,119],[56,57,119],[58,119],[57,58,119],[56,58,119],[119,165,182,183,184],[119,183],[55,119,183,184,185],[119,184],[119,187],[119,187,188,191,195],[119,194],[119,165,189,190],[119,210,211,212],[119,209,210],[119,165,209,210],[119,165,202,209],[119,236],[119,190,196],[50,119,189,196,229,231,233,236],[50,119,190,196,229,230,236],[119,189,196,232],[119,190],[119,189,190,196,236],[119,165,186,189,196,222,226,227,228,234,235],[119,165,203],[119,203,204,205,206,207,208],[119,165,202],[119,218],[119,201,218,220,221],[119,165,186,189,196,200,201,218,219],[119,165,196,213,217],[119,165,222],[119,165,186,222,223],[119,223,224,225],[119,126,165,186,222,223],[236],[190],[189,236],[229,236],[189,232],[165,186,222,226]],"referencedMap":[[240,1],[238,2],[144,3],[127,2],[146,4],[128,5],[145,2],[150,6],[151,7],[147,7],[153,8],[148,7],[152,9],[149,10],[135,11],[132,12],[139,13],[133,11],[130,14],[138,2],[143,15],[140,2],[141,2],[142,2],[137,12],[134,16],[131,2],[136,17],[189,2],[202,13],[198,18],[199,18],[200,19],[197,2],[64,20],[65,20],[67,21],[68,20],[69,20],[70,22],[71,2],[72,2],[73,2],[66,20],[165,23],[74,24],[154,25],[157,26],[158,2],[159,2],[160,2],[161,2],[162,2],[163,27],[164,28],[192,2],[194,29],[193,2],[243,30],[239,1],[241,31],[242,1],[190,12],[156,32],[244,2],[245,2],[248,33],[246,2],[249,34],[250,2],[251,35],[252,36],[263,37],[262,38],[247,2],[264,2],[266,39],[267,40],[265,41],[268,42],[269,43],[270,44],[271,45],[272,46],[273,47],[274,48],[275,49],[276,50],[277,51],[278,2],[155,2],[75,52],[76,52],[78,53],[79,54],[80,55],[81,56],[82,57],[83,58],[84,59],[85,60],[86,61],[87,62],[88,62],[89,63],[90,64],[91,65],[92,66],[77,2],[125,2],[93,67],[94,68],[95,69],[126,70],[96,71],[97,72],[98,73],[99,74],[100,75],[101,76],[102,77],[103,78],[104,79],[105,80],[106,81],[107,82],[109,83],[108,84],[110,85],[111,86],[112,2],[113,87],[114,88],[115,89],[116,90],[117,91],[118,92],[119,93],[120,94],[121,95],[122,96],[123,97],[124,98],[279,2],[280,12],[281,2],[282,2],[284,99],[283,2],[285,12],[310,100],[311,101],[286,102],[289,102],[308,100],[309,100],[299,100],[298,103],[296,100],[291,100],[304,100],[302,100],[306,100],[290,100],[303,100],[307,100],[292,100],[293,100],[305,100],[287,100],[294,100],[295,100],[297,100],[301,100],[312,104],[300,100],[288,100],[325,105],[324,2],[319,104],[321,106],[320,104],[313,104],[314,104],[316,104],[318,104],[322,106],[323,106],[315,106],[317,106],[327,107],[326,2],[328,2],[227,2],[329,2],[330,108],[129,2],[253,2],[214,109],[217,110],[215,111],[216,111],[176,2],[173,112],[175,112],[174,112],[172,112],[182,113],[177,114],[181,2],[178,2],[180,2],[179,2],[168,112],[169,112],[170,112],[166,2],[167,2],[171,112],[254,2],[258,115],[260,116],[259,115],[257,117],[261,118],[256,119],[255,2],[56,2],[63,120],[58,121],[59,122],[60,122],[61,123],[62,123],[57,124],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[30,2],[31,2],[32,2],[33,2],[7,2],[34,2],[39,2],[40,2],[35,2],[36,2],[37,2],[38,2],[1,2],[41,2],[55,2],[185,125],[184,126],[186,127],[183,128],[188,129],[196,130],[195,131],[187,2],[191,132],[213,133],[211,134],[212,135],[210,136],[228,137],[229,138],[234,139],[231,140],[233,141],[230,142],[232,142],[235,143],[236,144],[237,137],[204,145],[205,145],[206,2],[207,145],[209,146],[203,147],[208,145],[201,2],[219,148],[221,148],[222,149],[220,150],[218,151],[223,152],[224,153],[226,154],[225,155],[46,2],[47,2],[48,2],[49,2],[50,2],[51,2],[42,2],[52,2],[53,2],[54,2],[43,2],[44,2],[45,2]],"exportedModulesMap":[[240,1],[238,2],[144,3],[127,2],[146,4],[128,5],[145,2],[150,6],[151,7],[147,7],[153,8],[148,7],[152,9],[149,10],[135,11],[132,12],[139,13],[133,11],[130,14],[138,2],[143,15],[140,2],[141,2],[142,2],[137,12],[134,16],[131,2],[136,17],[189,2],[202,13],[198,18],[199,18],[200,19],[197,2],[64,20],[65,20],[67,21],[68,20],[69,20],[70,22],[71,2],[72,2],[73,2],[66,20],[165,23],[74,24],[154,25],[157,26],[158,2],[159,2],[160,2],[161,2],[162,2],[163,27],[164,28],[192,2],[194,29],[193,2],[243,30],[239,1],[241,31],[242,1],[190,12],[156,32],[244,2],[245,2],[248,33],[246,2],[249,34],[250,2],[251,35],[252,36],[263,37],[262,38],[247,2],[264,2],[266,39],[267,40],[265,41],[268,42],[269,43],[270,44],[271,45],[272,46],[273,47],[274,48],[275,49],[276,50],[277,51],[278,2],[155,2],[75,52],[76,52],[78,53],[79,54],[80,55],[81,56],[82,57],[83,58],[84,59],[85,60],[86,61],[87,62],[88,62],[89,63],[90,64],[91,65],[92,66],[77,2],[125,2],[93,67],[94,68],[95,69],[126,70],[96,71],[97,72],[98,73],[99,74],[100,75],[101,76],[102,77],[103,78],[104,79],[105,80],[106,81],[107,82],[109,83],[108,84],[110,85],[111,86],[112,2],[113,87],[114,88],[115,89],[116,90],[117,91],[118,92],[119,93],[120,94],[121,95],[122,96],[123,97],[124,98],[279,2],[280,12],[281,2],[282,2],[284,99],[283,2],[285,12],[310,100],[311,101],[286,102],[289,102],[308,100],[309,100],[299,100],[298,103],[296,100],[291,100],[304,100],[302,100],[306,100],[290,100],[303,100],[307,100],[292,100],[293,100],[305,100],[287,100],[294,100],[295,100],[297,100],[301,100],[312,104],[300,100],[288,100],[325,105],[324,2],[319,104],[321,106],[320,104],[313,104],[314,104],[316,104],[318,104],[322,106],[323,106],[315,106],[317,106],[327,107],[326,2],[328,2],[227,2],[329,2],[330,108],[129,2],[253,2],[214,109],[217,110],[215,111],[216,111],[176,2],[173,112],[175,112],[174,112],[172,112],[182,113],[177,114],[181,2],[178,2],[180,2],[179,2],[168,112],[169,112],[170,112],[166,2],[167,2],[171,112],[254,2],[258,115],[260,116],[259,115],[257,117],[261,118],[256,119],[255,2],[56,2],[63,120],[58,121],[59,122],[60,122],[61,123],[62,123],[57,124],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[30,2],[31,2],[32,2],[33,2],[7,2],[34,2],[39,2],[40,2],[35,2],[36,2],[37,2],[38,2],[1,2],[41,2],[55,2],[185,125],[184,126],[186,127],[183,128],[188,129],[196,130],[195,131],[187,2],[191,132],[213,133],[211,134],[212,135],[210,136],[228,156],[229,157],[234,158],[231,159],[233,160],[230,157],[232,157],[235,158],[236,161],[237,137],[204,145],[205,145],[206,2],[207,145],[209,146],[203,147],[208,145],[201,2],[219,148],[221,148],[222,149],[220,150],[218,151],[223,152],[224,153],[226,154],[225,155],[46,2],[47,2],[48,2],[49,2],[50,2],[51,2],[42,2],[52,2],[53,2],[54,2],[43,2],[44,2],[45,2]],"semanticDiagnosticsPerFile":[240,238,144,127,146,128,145,150,151,147,153,148,152,149,135,132,139,133,130,138,143,140,141,142,137,134,131,136,189,202,198,199,200,197,64,65,67,68,69,70,71,72,73,66,165,74,154,157,158,159,160,161,162,163,164,192,194,193,243,239,241,242,190,156,244,245,248,246,249,250,251,252,263,262,247,264,266,267,265,268,269,270,271,272,273,274,275,276,277,278,155,75,76,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,77,125,93,94,95,126,96,97,98,99,100,101,102,103,104,105,106,107,109,108,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,279,280,281,282,284,283,285,310,311,286,289,308,309,299,298,296,291,304,302,306,290,303,307,292,293,305,287,294,295,297,301,312,300,288,325,324,319,321,320,313,314,316,318,322,323,315,317,327,326,328,227,329,330,129,253,214,217,215,216,176,173,175,174,172,182,177,181,178,180,179,168,169,170,166,167,171,254,258,260,259,257,261,256,255,56,63,58,59,60,61,62,57,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,30,31,32,33,7,34,39,40,35,36,37,38,1,41,55,185,184,186,183,188,196,195,187,191,213,211,212,210,228,229,234,231,233,230,232,235,236,237,204,205,206,207,209,203,208,201,219,221,222,220,218,223,224,226,225,46,47,48,49,50,51,42,52,53,54,43,44,45],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.8.4"}
-\ No newline at end of file
-diff --git a/dist/types/GasFeeController.d.ts.map b/dist/types/GasFeeController.d.ts.map
-index 84faaebaed6577287e57e16b6cb73a0809c3e90c..b8340ef0ce941a3108cfbe3cc34e5b9ff9cf609e 100644
---- a/dist/types/GasFeeController.d.ts.map
-+++ b/dist/types/GasFeeController.d.ts.map
-@@ -1 +1 @@
--{"version":3,"file":"GasFeeController.d.ts","sourceRoot":"","sources":["../../src/GasFeeController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAOnC,OAAO,KAAK,EACV,eAAe,EACf,8CAA8C,EAC9C,2CAA2C,EAC3C,+BAA+B,EAC/B,sCAAsC,EACtC,YAAY,EACZ,aAAa,EACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAY3C,eAAO,MAAM,yBAAyB,kDAAkD,CAAC;AAEzF,oBAAY,aAAa,GAAG,SAAS,CAAC;AAItC,oBAAY,qBAAqB,GAAG,YAAY,CAAC;AAIjD,oBAAY,kBAAkB,GAAG,QAAQ,CAAC;AAK1C,oBAAY,uBAAuB,GAAG,cAAc,CAAC;AAGrD,oBAAY,cAAc,GAAG,MAAM,CAAC;AAEpC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB;;;;;CAK9B,CAAC;AAEF,oBAAY,eAAe,GACvB,qBAAqB,GACrB,uBAAuB,GACvB,kBAAkB,GAClB,cAAc,CAAC;AAEnB,oBAAY,yBAAyB,GAAG;IACtC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,aAAa,CAAC;CACxC,CAAC;AAEF;;;;;;;GAOG;AAEH,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;;;;;GASG;AACH,oBAAY,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF;;;;;;;;GAQG;AACH,oBAAY,aAAa,GAAG;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,6BAA6B,EAAE,MAAM,CAAC;IACtC,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,oBAAY,eAAe,GAAG,sBAAsB,GAAG,uBAAuB,CAAC;AAE/E,aAAK,sBAAsB,GAAG;IAC5B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,aAAa,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,YAAY,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;IACtC,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,0BAA0B,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;IAC1C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,aAAK,uBAAuB,GAAG;IAC7B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,aAAa,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,IAAI,CAAC;IAC7B,YAAY,EAAE,IAAI,CAAC;IACnB,sBAAsB,EAAE,IAAI,CAAC;IAC7B,0BAA0B,EAAE,IAAI,CAAC;IACjC,gBAAgB,EAAE,IAAI,CAAC;IACvB,iBAAiB,EAAE,IAAI,CAAC;CACzB,CAAC;AAYF,oBAAY,sBAAsB,GAAG;IACnC,eAAe,EAAE,mBAAmB,CAAC;IACrC,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,EAAE,uBAAuB,CAAC;CAC1C,CAAC;AAEF,oBAAY,oBAAoB,GAAG;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,yBAAyB,EAAE,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7E,eAAe,EAAE,qBAAqB,CAAC;CACxC,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,eAAe,EAAE,sBAAsB,CAAC;IACxC,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,EAAE,kBAAkB,CAAC;CACrC,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvC,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,oBAAY,0BAA0B,GAAG;IACvC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF;;;;;;GAMG;AACH,oBAAY,sBAAsB,GAC9B,sBAAsB,GACtB,oBAAoB,GACpB,iBAAiB,GACjB,sBAAsB,CAAC;AAE3B,oBAAY,wBAAwB,GAAG;IACrC,wBAAwB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;CACnE,CAAC;AAEF,oBAAY,WAAW,GAAG,wBAAwB,GAAG,sBAAsB,CAAC;AAE5E,QAAA,MAAM,IAAI,qBAAqB,CAAC;AAEhC,oBAAY,iBAAiB,GAAG,0BAA0B,CACxD,OAAO,IAAI,EACX,WAAW,CACZ,CAAC;AAEF,oBAAY,cAAc,GAAG,wBAAwB,CAAC,OAAO,IAAI,EAAE,WAAW,CAAC,CAAC;AAEhF,oBAAY,uBAAuB,GAAG,cAAc,CAAC;AAErD,oBAAY,sBAAsB,GAAG,iBAAiB,CAAC;AAEvD,aAAK,cAAc,GACf,+BAA+B,GAC/B,2CAA2C,GAC3C,8CAA8C,CAAC;AAEnD,aAAK,eAAe,GAAG,6BAA6B,CAClD,OAAO,IAAI,EACX,uBAAuB,GAAG,cAAc,EACxC,sBAAsB,GAAG,sCAAsC,EAC/D,cAAc,CAAC,MAAM,CAAC,EACtB,sCAAsC,CAAC,MAAM,CAAC,CAC/C,CAAC;AASF;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,+BAA+B,CACnE,OAAO,IAAI,EACX,WAAW,EACX,eAAe,CAChB;;IACC,OAAO,CAAC,UAAU,CAAC,CAAgC;IAEnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAE3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAE5C,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC;IAEvD,OAAO,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IAE5D,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC;IAEvD,OAAO,CAAC,cAAc,CAAC;IAEvB,OAAO,CAAC,QAAQ,CAAC,CAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAS;IAInC;;;;;;;;;;;;;;;;;;;;;;OAsBG;gBACS,EACV,QAAgB,EAChB,SAAS,EACT,KAAK,EACL,qCAAqC,EACrC,qCAAqC,EACrC,UAAU,EACV,0CAA0C,EAC1C,WAAW,EACX,kBAAkB,EAClB,iBAA6C,EAC7C,kBAAkB,EAClB,QAAQ,GACT,EAAE;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,eAAe,CAAC;QAC3B,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,qCAAqC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9D,0CAA0C,EAAE,MAAM,OAAO,CAAC;QAC1D,qCAAqC,CAAC,EAAE,MAAM,OAAO,CAAC;QACtD,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC;QACvB,WAAW,EAAE,MAAM,aAAa,CAAC;QACjC,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,KAAK,IAAI,CAAC;QACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAyCK,YAAY;IAWZ,oBAAoB,CAAC,OAAO,CAAC,EAAE,0BAA0B;IAIzD,iCAAiC,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,OAAO,CAAC,MAAM,CAAC;IAalB;;;;;;;OAOG;IACG,wBAAwB,CAC5B,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,WAAW,CAAC;IAkFvB;;;;OAIG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM;IAOlC,WAAW;IAQX;;;;OAIG;IACM,OAAO;IAKhB,OAAO,CAAC,KAAK;IAUb;;;;;;OAMG;IACG,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,OAAO,CAAC,UAAU;YAMJ,uBAAuB;IAWrC,eAAe,CACb,oBAAoB,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,GACnB,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;CAwBrD;AAED,eAAe,gBAAgB,CAAC"}
-\ No newline at end of file
-+{"version":3,"file":"GasFeeController.d.ts","sourceRoot":"","sources":["../../src/GasFeeController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAOnC,OAAO,KAAK,EACV,eAAe,EACf,8CAA8C,EAC9C,2CAA2C,EAC3C,+BAA+B,EAC/B,sCAAsC,EACtC,YAAY,EACZ,aAAa,EACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAY3C,eAAO,MAAM,yBAAyB,kDAAkD,CAAC;AAEzF,oBAAY,aAAa,GAAG,SAAS,CAAC;AAItC,oBAAY,qBAAqB,GAAG,YAAY,CAAC;AAIjD,oBAAY,kBAAkB,GAAG,QAAQ,CAAC;AAK1C,oBAAY,uBAAuB,GAAG,cAAc,CAAC;AAGrD,oBAAY,cAAc,GAAG,MAAM,CAAC;AAEpC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB;;;;;CAK9B,CAAC;AAEF,oBAAY,eAAe,GACvB,qBAAqB,GACrB,uBAAuB,GACvB,kBAAkB,GAClB,cAAc,CAAC;AAEnB,oBAAY,yBAAyB,GAAG;IACtC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,aAAa,CAAC;CACxC,CAAC;AAEF;;;;;;;GAOG;AAEH,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;;;;;GASG;AACH,oBAAY,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF;;;;;;;;GAQG;AACH,oBAAY,aAAa,GAAG;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,6BAA6B,EAAE,MAAM,CAAC;IACtC,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,oBAAY,eAAe,GAAG,sBAAsB,GAAG,uBAAuB,CAAC;AAE/E,aAAK,sBAAsB,GAAG;IAC5B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,aAAa,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,YAAY,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;IACtC,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,0BAA0B,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;IAC1C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,aAAK,uBAAuB,GAAG;IAC7B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,aAAa,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,IAAI,CAAC;IAC7B,YAAY,EAAE,IAAI,CAAC;IACnB,sBAAsB,EAAE,IAAI,CAAC;IAC7B,0BAA0B,EAAE,IAAI,CAAC;IACjC,gBAAgB,EAAE,IAAI,CAAC;IACvB,iBAAiB,EAAE,IAAI,CAAC;CACzB,CAAC;AAYF,oBAAY,sBAAsB,GAAG;IACnC,eAAe,EAAE,mBAAmB,CAAC;IACrC,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,EAAE,uBAAuB,CAAC;CAC1C,CAAC;AAEF,oBAAY,oBAAoB,GAAG;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,yBAAyB,EAAE,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7E,eAAe,EAAE,qBAAqB,CAAC;CACxC,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,eAAe,EAAE,sBAAsB,CAAC;IACxC,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,EAAE,kBAAkB,CAAC;CACrC,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvC,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,eAAe,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,oBAAY,0BAA0B,GAAG;IACvC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF;;;;;;GAMG;AACH,oBAAY,sBAAsB,GAC9B,sBAAsB,GACtB,oBAAoB,GACpB,iBAAiB,GACjB,sBAAsB,CAAC;AAE3B,oBAAY,wBAAwB,GAAG;IACrC,wBAAwB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;CACnE,CAAC;AAEF,oBAAY,WAAW,GAAG,wBAAwB,GAAG,sBAAsB,CAAC;AAE5E,QAAA,MAAM,IAAI,qBAAqB,CAAC;AAEhC,oBAAY,iBAAiB,GAAG,0BAA0B,CACxD,OAAO,IAAI,EACX,WAAW,CACZ,CAAC;AAEF,oBAAY,cAAc,GAAG,wBAAwB,CAAC,OAAO,IAAI,EAAE,WAAW,CAAC,CAAC;AAEhF,oBAAY,uBAAuB,GAAG,cAAc,CAAC;AAErD,oBAAY,sBAAsB,GAAG,iBAAiB,CAAC;AAEvD,aAAK,cAAc,GACf,+BAA+B,GAC/B,2CAA2C,GAC3C,8CAA8C,CAAC;AAEnD,aAAK,eAAe,GAAG,6BAA6B,CAClD,OAAO,IAAI,EACX,uBAAuB,GAAG,cAAc,EACxC,sBAAsB,GAAG,sCAAsC,EAC/D,cAAc,CAAC,MAAM,CAAC,EACtB,sCAAsC,CAAC,MAAM,CAAC,CAC/C,CAAC;AASF;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,+BAA+B,CACnE,OAAO,IAAI,EACX,WAAW,EACX,eAAe,CAChB;;IACC,OAAO,CAAC,UAAU,CAAC,CAAgC;IAEnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAE3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAE5C,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC;IAEvD,OAAO,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IAE5D,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC;IAEvD,OAAO,CAAC,cAAc,CAAC;IAEvB,OAAO,CAAC,QAAQ,CAAC,CAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAS;IAInC;;;;;;;;;;;;;;;;;;;;;;OAsBG;gBACS,EACV,QAAgB,EAChB,SAAS,EACT,KAAK,EACL,qCAAqC,EACrC,qCAAqC,EACrC,UAAU,EACV,0CAA0C,EAC1C,WAAW,EACX,kBAAkB,EAClB,iBAA6C,EAC7C,kBAAkB,EAClB,QAAQ,GACT,EAAE;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,eAAe,CAAC;QAC3B,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,qCAAqC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9D,0CAA0C,EAAE,MAAM,OAAO,CAAC;QAC1D,qCAAqC,CAAC,EAAE,MAAM,OAAO,CAAC;QACtD,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC;QACvB,WAAW,EAAE,MAAM,aAAa,CAAC;QACjC,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,KAAK,IAAI,CAAC;QACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAyCK,YAAY;IAWZ,oBAAoB,CAAC,OAAO,CAAC,EAAE,0BAA0B;IAIzD,iCAAiC,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,OAAO,CAAC,MAAM,CAAC;IAalB;;;;;;;OAOG;IACG,wBAAwB,CAC5B,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,WAAW,CAAC;IAqFvB;;;;OAIG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM;IAOlC,WAAW;IAQX;;;;OAIG;IACM,OAAO;IAKhB,OAAO,CAAC,KAAK;IAUb;;;;;;OAMG;IACG,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,OAAO,CAAC,UAAU;YAMJ,uBAAuB;IAWrC,eAAe,CACb,oBAAoB,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,GACnB,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;CAwBrD;AAED,eAAe,gBAAgB,CAAC"}
-\ No newline at end of file
diff --git a/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch b/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch
deleted file mode 100644
index 254cf55f3f5f..000000000000
--- a/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/dist/KeyringController.js b/dist/KeyringController.js
-index fc649ea6fc97b905d811b236de638172fb10b548..beab676ab85e5e372eda7846e98b7d34af6317f5 100644
---- a/dist/KeyringController.js
-+++ b/dist/KeyringController.js
-@@ -1092,9 +1092,13 @@ _KeyringController_keyringBuilders = new WeakMap(), _KeyringController_keyrings
- }, _KeyringController_addQRKeyring = function _KeyringController_addQRKeyring() {
-     return __awaiter(this, void 0, void 0, function* () {
-         // QRKeyring is not yet compatible with Keyring type from @metamask/utils
--        const qrKeyring = (yield __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, KeyringTypes.qr, {
--            accounts: [],
--        }));
-+        /**
-+         *  Patch for @metamask/keyring-controller v13.0.0
-+         *  Below code change will fix the issue 23804, The intial code added a empty accounts as argument when creating a new QR keyring.
-+         *  cause the new Keystone MetamaskKeyring default properties all are undefined during deserialise() process.
-+         *  Please refer to PR 23903 for detail.
-+         */
-+        const qrKeyring = (yield __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, KeyringTypes.qr));
-         const accounts = yield qrKeyring.getAccounts();
-         yield __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_checkForDuplicate).call(this, KeyringTypes.qr, accounts);
-         __classPrivateFieldGet(this, _KeyringController_keyrings, "f").push(qrKeyring);
diff --git a/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch b/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch
new file mode 100644
index 000000000000..27d866a74888
--- /dev/null
+++ b/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch
@@ -0,0 +1,120 @@
+diff --git a/dist/chunk-52QZQQKP.mjs b/dist/chunk-52QZQQKP.mjs
+index 934f432c8013a6af5303726e1495bed2335fa078..8de2560fe81dfc3dbfef83dd0079482306c425d9 100644
+--- a/dist/chunk-52QZQQKP.mjs
++++ b/dist/chunk-52QZQQKP.mjs
+@@ -2,7 +2,8 @@ import {
+   __privateAdd,
+   __privateGet,
+   __privateMethod,
+-  __privateSet
++  __privateSet,
++  KeyringControllerError
+ } from "./chunk-NAAWD7HX.mjs";
+ 
+ // src/KeyringController.ts
+@@ -582,6 +583,18 @@ var KeyringController = class extends BaseController {
+       })
+     );
+     serializedKeyrings.push(...__privateGet(this, _unsupportedKeyrings));
++    /**
++     * ============================== PATCH INFORMATION ==============================
++     * The HD keyring is the default keyring for all wallets if this keyring is missing
++     * for some reason we should avoid saving the keyrings
++     *
++     * The upstream fix is here: https://github.com/MetaMask/core/pull/4168
++     *
++     * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
++     */
++    if (!serializedKeyrings.some((keyring) => keyring.type === KeyringTypes.hd)) {
++      throw new Error(KeyringControllerError.NoHdKeyring);
++    }
+     let vault;
+     let newEncryptionKey;
+     if (__privateGet(this, _cacheEncryptionKey)) {
+@@ -1087,9 +1100,16 @@ getKeyringBuilderForType_fn = function(type) {
+ };
+ _addQRKeyring = new WeakSet();
+ addQRKeyring_fn = async function() {
+-  const qrKeyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */, {
+-    accounts: []
+-  });
++  /**
++   * Patch for @metamask/keyring-controller v13.0.0
++   * Below code change will fix the issue 23804, The intial code added a empty accounts as argument when creating a new QR keyring.
++   * cause the new Keystone MetamaskKeyring default properties all are undefined during deserialise() process.
++   * Please refer to PR 23903 for detail.
++   *
++   * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
++   */
++  // @ts-expect-error See patch note
++  const qrKeyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device");
+   const accounts = await qrKeyring.getAccounts();
+   await __privateMethod(this, _checkForDuplicate, checkForDuplicate_fn).call(this, "QR Hardware Wallet Device" /* qr */, accounts);
+   __privateGet(this, _keyrings).push(qrKeyring);
+diff --git a/dist/chunk-CHLPTPMZ.js b/dist/chunk-CHLPTPMZ.js
+index bef1a8e9dd5efe426f8aaaba1fe4501b124f7e87..7b48c000e54708da2a689e2d6cb1b61a279f1205 100644
+--- a/dist/chunk-CHLPTPMZ.js
++++ b/dist/chunk-CHLPTPMZ.js
+@@ -50,6 +50,7 @@ var KeyringControllerError = /* @__PURE__ */ ((KeyringControllerError2) => {
+   KeyringControllerError2["ExpiredCredentials"] = "KeyringController - Encryption key and salt provided are expired";
+   KeyringControllerError2["NoKeyringBuilder"] = "KeyringController - No keyringBuilder found for keyring";
+   KeyringControllerError2["DataType"] = "KeyringController - Incorrect data type provided";
++  KeyringControllerError2["NoHdKeyring"] = "KeyringController - No HD Keyring found";
+   return KeyringControllerError2;
+ })(KeyringControllerError || {});
+ 
+diff --git a/dist/chunk-GXM4O6HW.js b/dist/chunk-GXM4O6HW.js
+index f7539e2e6354f418cbb095cc1a2cda01a5bdeae6..978f4426536c594568ecc56f1c27881db4bfa861 100644
+--- a/dist/chunk-GXM4O6HW.js
++++ b/dist/chunk-GXM4O6HW.js
+@@ -582,6 +582,18 @@ var KeyringController = class extends _basecontroller.BaseController {
+       })
+     );
+     serializedKeyrings.push(..._chunkCHLPTPMZjs.__privateGet.call(void 0, this, _unsupportedKeyrings));
++    /**
++     * ============================== PATCH INFORMATION ==============================
++     * The HD keyring is the default keyring for all wallets if this keyring is missing
++     * for some reason we should avoid saving the keyrings
++     *
++     * The upstream fix is here: https://github.com/MetaMask/core/pull/4168
++     *
++     * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
++     */
++    if (!serializedKeyrings.some((keyring) => keyring.type === KeyringTypes.hd)) {
++      throw new Error(_chunkCHLPTPMZjs.KeyringControllerError.NoHdKeyring);
++    }
+     let vault;
+     let newEncryptionKey;
+     if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+@@ -1087,9 +1099,16 @@ getKeyringBuilderForType_fn = function(type) {
+ };
+ _addQRKeyring = new WeakSet();
+ addQRKeyring_fn = async function() {
+-  const qrKeyring = await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */, {
+-    accounts: []
+-  });
++  /**
++   * Patch for @metamask/keyring-controller v13.0.0
++   * Below code change will fix the issue 23804, The intial code added a empty accounts as argument when creating a new QR keyring.
++   * cause the new Keystone MetamaskKeyring default properties all are undefined during deserialise() process.
++   * Please refer to PR 23903 for detail.
++   *
++   * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
++   */
++  // @ts-expect-error See patch note
++  const qrKeyring = await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device");
+   const accounts = await qrKeyring.getAccounts();
+   await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, "QR Hardware Wallet Device" /* qr */, accounts);
+   _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).push(qrKeyring);
+diff --git a/dist/chunk-NAAWD7HX.mjs b/dist/chunk-NAAWD7HX.mjs
+index b5de23aabec9d502e8e6423480ffaaff26257bfc..a0c027a7c13828883ec5c05cbb7eab92c41f0dc3 100644
+--- a/dist/chunk-NAAWD7HX.mjs
++++ b/dist/chunk-NAAWD7HX.mjs
+@@ -50,6 +50,7 @@ var KeyringControllerError = /* @__PURE__ */ ((KeyringControllerError2) => {
+   KeyringControllerError2["ExpiredCredentials"] = "KeyringController - Encryption key and salt provided are expired";
+   KeyringControllerError2["NoKeyringBuilder"] = "KeyringController - No keyringBuilder found for keyring";
+   KeyringControllerError2["DataType"] = "KeyringController - Incorrect data type provided";
++  KeyringControllerError2["NoHdKeyring"] = "KeyringController - No HD Keyring found";
+   return KeyringControllerError2;
+ })(KeyringControllerError || {});
+ 
diff --git a/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch b/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch
similarity index 60%
rename from .yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch
rename to .yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch
index 9469548a639d..581382429ebb 100644
--- a/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch
+++ b/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch
@@ -1,23 +1,23 @@
-diff --git a/dist/chunk-VNCJZRDU.js b/dist/chunk-VNCJZRDU.js
-index 78251fc9517438d90261ed53172d2a4133d3a5fd..3ecc0c2838ac12c0ff5b5521a82b08955287956b 100644
---- a/dist/chunk-VNCJZRDU.js
-+++ b/dist/chunk-VNCJZRDU.js
-@@ -323,7 +323,6 @@ var NetworkController = class extends _basecontroller.BaseController {
+diff --git a/dist/chunk-AJED3H6M.mjs b/dist/chunk-AJED3H6M.mjs
+index c7f9903611ccf8f0bb01bea786177efc1a915f7f..26d559fe80f193288badd737cfb8f9d91eb3fa67 100644
+--- a/dist/chunk-AJED3H6M.mjs
++++ b/dist/chunk-AJED3H6M.mjs
+@@ -341,7 +341,6 @@ var NetworkController = class extends BaseController {
    async initializeProvider() {
-     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+     __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+     __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
 -    await this.lookupNetwork();
    }
    /**
     * Refreshes the network meta with EIP-1559 support and the network status
-diff --git a/dist/chunk-XWP6GXMK.mjs b/dist/chunk-XWP6GXMK.mjs
-index fb7e30d27367a38e8a357ff9e744894a4505b5a5..884bb1d124934a613847d7fd398fbc6cb02cade8 100644
---- a/dist/chunk-XWP6GXMK.mjs
-+++ b/dist/chunk-XWP6GXMK.mjs
-@@ -323,7 +323,6 @@ var NetworkController = class extends BaseController {
+diff --git a/dist/chunk-UEWIYOS6.js b/dist/chunk-UEWIYOS6.js
+index 05e09914e085ed2fb67106bc750b8bb46882c80e..16eb520b7658625e411c9c6e35f86bd49fcce52f 100644
+--- a/dist/chunk-UEWIYOS6.js
++++ b/dist/chunk-UEWIYOS6.js
+@@ -341,7 +341,6 @@ var NetworkController = class extends _basecontroller.BaseController {
    async initializeProvider() {
-     __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-     __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
 -    await this.lookupNetwork();
    }
    /**
diff --git a/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch b/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch
new file mode 100644
index 000000000000..30a3ce9aff85
--- /dev/null
+++ b/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch
@@ -0,0 +1,149 @@
+diff --git a/dist/chunk-HBNET6MY.mjs b/dist/chunk-HBNET6MY.mjs
+index 5843d635c91e9125d130a6ef5688550e5d514eaa..ca94b6c69ac51c1415968339fe188b2141bce044 100644
+--- a/dist/chunk-HBNET6MY.mjs
++++ b/dist/chunk-HBNET6MY.mjs
+@@ -117,7 +117,7 @@ function truncateSnap(snap) {
+   return truncatedSnap;
+ }
+ var name = "SnapController";
+-var _closeAllConnections, _dynamicPermissions, _environmentEndowmentPermissions, _excludedPermissions, _featureFlags, _fetchFunction, _idleTimeCheckInterval, _maxIdleTime, _encryptor, _getMnemonic, _detectSnapLocation, _snapsRuntimeData, _rollbackSnapshots, _timeoutForLastRequestStatus, _statusMachine, _initializeStateMachine, initializeStateMachine_fn, _registerMessageHandlers, registerMessageHandlers_fn, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn, _pollForLastRequestStatus, pollForLastRequestStatus_fn, _blockSnap, blockSnap_fn, _unblockSnap, unblockSnap_fn, _assertIsInstallAllowed, assertIsInstallAllowed_fn, _stopSnapsLastRequestPastMax, stopSnapsLastRequestPastMax_fn, _transition, transition_fn, _terminateSnap, terminateSnap_fn, _getSnapEncryptionKey, getSnapEncryptionKey_fn, _decryptSnapState, decryptSnapState_fn, _encryptSnapState, encryptSnapState_fn, _handleInitialConnections, handleInitialConnections_fn, _addSnapToSubject, addSnapToSubject_fn, _removeSnapFromSubjects, removeSnapFromSubjects_fn, _revokeAllSnapPermissions, revokeAllSnapPermissions_fn, _createApproval, createApproval_fn, _updateApproval, updateApproval_fn, _resolveAllowlistVersion, resolveAllowlistVersion_fn, _add, add_fn, _startSnap, startSnap_fn, _getEndowments, getEndowments_fn, _set, set_fn, _validateSnapPermissions, validateSnapPermissions_fn, _getExecutionTimeout, getExecutionTimeout_fn, _getRpcRequestHandler, getRpcRequestHandler_fn, _createInterface, createInterface_fn, _assertInterfaceExists, assertInterfaceExists_fn, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn, _recordSnapRpcRequestStart, recordSnapRpcRequestStart_fn, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn, _getRollbackSnapshot, getRollbackSnapshot_fn, _createRollbackSnapshot, createRollbackSnapshot_fn, _rollbackSnap, rollbackSnap_fn, _rollbackSnaps, rollbackSnaps_fn, _getRuntime, getRuntime_fn, _getRuntimeExpect, getRuntimeExpect_fn, _setupRuntime, setupRuntime_fn, _calculatePermissionsChange, calculatePermissionsChange_fn, _updatePermissions, updatePermissions_fn, _isValidUpdate, isValidUpdate_fn, _callLifecycleHook, callLifecycleHook_fn;
++var _closeAllConnections, _dynamicPermissions, _environmentEndowmentPermissions, _excludedPermissions, _featureFlags, _fetchFunction, _idleTimeCheckInterval, _maxIdleTime, _encryptor, _getMnemonic, _detectSnapLocation, _snapsRuntimeData, _rollbackSnapshots, _timeoutForLastRequestStatus, _statusMachine, _preinstalledSnaps, _initializeStateMachine, initializeStateMachine_fn, _registerMessageHandlers, registerMessageHandlers_fn, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn, _pollForLastRequestStatus, pollForLastRequestStatus_fn, _blockSnap, blockSnap_fn, _unblockSnap, unblockSnap_fn, _assertIsInstallAllowed, assertIsInstallAllowed_fn, _stopSnapsLastRequestPastMax, stopSnapsLastRequestPastMax_fn, _transition, transition_fn, _terminateSnap, terminateSnap_fn, _getSnapEncryptionKey, getSnapEncryptionKey_fn, _decryptSnapState, decryptSnapState_fn, _encryptSnapState, encryptSnapState_fn, _handleInitialConnections, handleInitialConnections_fn, _addSnapToSubject, addSnapToSubject_fn, _removeSnapFromSubjects, removeSnapFromSubjects_fn, _revokeAllSnapPermissions, revokeAllSnapPermissions_fn, _createApproval, createApproval_fn, _updateApproval, updateApproval_fn, _resolveAllowlistVersion, resolveAllowlistVersion_fn, _add, add_fn, _startSnap, startSnap_fn, _getEndowments, getEndowments_fn, _set, set_fn, _validateSnapPermissions, validateSnapPermissions_fn, _getExecutionTimeout, getExecutionTimeout_fn, _getRpcRequestHandler, getRpcRequestHandler_fn, _createInterface, createInterface_fn, _assertInterfaceExists, assertInterfaceExists_fn, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn, _recordSnapRpcRequestStart, recordSnapRpcRequestStart_fn, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn, _getRollbackSnapshot, getRollbackSnapshot_fn, _createRollbackSnapshot, createRollbackSnapshot_fn, _rollbackSnap, rollbackSnap_fn, _rollbackSnaps, rollbackSnaps_fn, _getRuntime, getRuntime_fn, _getRuntimeExpect, getRuntimeExpect_fn, _setupRuntime, setupRuntime_fn, _calculatePermissionsChange, calculatePermissionsChange_fn, _updatePermissions, updatePermissions_fn, _isValidUpdate, isValidUpdate_fn, _callLifecycleHook, callLifecycleHook_fn;
+ var SnapController = class extends BaseController {
+   constructor({
+     closeAllConnections,
+@@ -132,7 +132,7 @@ var SnapController = class extends BaseController {
+     fetchFunction = globalThis.fetch.bind(globalThis),
+     featureFlags = {},
+     detectSnapLocation: detectSnapLocationFunction = detectSnapLocation,
+-    preinstalledSnaps,
++    preinstalledSnaps = null,
+     encryptor,
+     getMnemonic
+   }) {
+@@ -448,6 +448,7 @@ var SnapController = class extends BaseController {
+     __privateAdd(this, _rollbackSnapshots, void 0);
+     __privateAdd(this, _timeoutForLastRequestStatus, void 0);
+     __privateAdd(this, _statusMachine, void 0);
++    __privateAdd(this, _preinstalledSnaps, void 0);
+     __privateSet(this, _closeAllConnections, closeAllConnections);
+     __privateSet(this, _dynamicPermissions, dynamicPermissions);
+     __privateSet(this, _environmentEndowmentPermissions, environmentEndowmentPermissions);
+@@ -460,6 +461,7 @@ var SnapController = class extends BaseController {
+     __privateSet(this, _detectSnapLocation, detectSnapLocationFunction);
+     __privateSet(this, _encryptor, encryptor);
+     __privateSet(this, _getMnemonic, getMnemonic);
++    __privateSet(this, _preinstalledSnaps, preinstalledSnaps);
+     this._onUnhandledSnapError = this._onUnhandledSnapError.bind(this);
+     this._onOutboundRequest = this._onOutboundRequest.bind(this);
+     this._onOutboundResponse = this._onOutboundResponse.bind(this);
+@@ -498,8 +500,8 @@ var SnapController = class extends BaseController {
+     });
+     __privateMethod(this, _initializeStateMachine, initializeStateMachine_fn).call(this);
+     __privateMethod(this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
+-    if (preinstalledSnaps) {
+-      __privateMethod(this, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn).call(this, preinstalledSnaps);
++    if (__privateGet(this, _preinstalledSnaps)) {
++      __privateMethod(this, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn).call(this, __privateGet(this, _preinstalledSnaps));
+     }
+     Object.values(this.state?.snaps ?? {}).forEach(
+       (snap) => __privateMethod(this, _setupRuntime, setupRuntime_fn).call(this, snap.id)
+@@ -801,6 +803,13 @@ var SnapController = class extends BaseController {
+       state.snaps = {};
+       state.snapStates = {};
+     });
++    __privateGet(this, _snapsRuntimeData).clear();
++    if (__privateGet(this, _preinstalledSnaps)) {
++      __privateMethod(this, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn).call(this, __privateGet(this, _preinstalledSnaps));
++      Object.values(this.state?.snaps).forEach(
++        (snap) => __privateMethod(this, _setupRuntime, setupRuntime_fn).call(this, snap.id)
++      );
++    }
+   }
+   /**
+    * Removes the given snap from state, and clears all associated handlers
+@@ -1420,6 +1429,7 @@ _snapsRuntimeData = new WeakMap();
+ _rollbackSnapshots = new WeakMap();
+ _timeoutForLastRequestStatus = new WeakMap();
+ _statusMachine = new WeakMap();
++_preinstalledSnaps = new WeakMap();
+ _initializeStateMachine = new WeakSet();
+ initializeStateMachine_fn = function() {
+   const disableGuard = ({ snapId }) => {
+diff --git a/dist/chunk-JMP6XYRL.js b/dist/chunk-JMP6XYRL.js
+index 20c3b12643e4f87d70aa0df96a36c4dda8b1ed47..5ac24c006b8db0b06d3a48cc312ba630845ef79c 100644
+--- a/dist/chunk-JMP6XYRL.js
++++ b/dist/chunk-JMP6XYRL.js
+@@ -117,7 +117,7 @@ function truncateSnap(snap) {
+   return truncatedSnap;
+ }
+ var name = "SnapController";
+-var _closeAllConnections, _dynamicPermissions, _environmentEndowmentPermissions, _excludedPermissions, _featureFlags, _fetchFunction, _idleTimeCheckInterval, _maxIdleTime, _encryptor, _getMnemonic, _detectSnapLocation, _snapsRuntimeData, _rollbackSnapshots, _timeoutForLastRequestStatus, _statusMachine, _initializeStateMachine, initializeStateMachine_fn, _registerMessageHandlers, registerMessageHandlers_fn, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn, _pollForLastRequestStatus, pollForLastRequestStatus_fn, _blockSnap, blockSnap_fn, _unblockSnap, unblockSnap_fn, _assertIsInstallAllowed, assertIsInstallAllowed_fn, _stopSnapsLastRequestPastMax, stopSnapsLastRequestPastMax_fn, _transition, transition_fn, _terminateSnap, terminateSnap_fn, _getSnapEncryptionKey, getSnapEncryptionKey_fn, _decryptSnapState, decryptSnapState_fn, _encryptSnapState, encryptSnapState_fn, _handleInitialConnections, handleInitialConnections_fn, _addSnapToSubject, addSnapToSubject_fn, _removeSnapFromSubjects, removeSnapFromSubjects_fn, _revokeAllSnapPermissions, revokeAllSnapPermissions_fn, _createApproval, createApproval_fn, _updateApproval, updateApproval_fn, _resolveAllowlistVersion, resolveAllowlistVersion_fn, _add, add_fn, _startSnap, startSnap_fn, _getEndowments, getEndowments_fn, _set, set_fn, _validateSnapPermissions, validateSnapPermissions_fn, _getExecutionTimeout, getExecutionTimeout_fn, _getRpcRequestHandler, getRpcRequestHandler_fn, _createInterface, createInterface_fn, _assertInterfaceExists, assertInterfaceExists_fn, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn, _recordSnapRpcRequestStart, recordSnapRpcRequestStart_fn, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn, _getRollbackSnapshot, getRollbackSnapshot_fn, _createRollbackSnapshot, createRollbackSnapshot_fn, _rollbackSnap, rollbackSnap_fn, _rollbackSnaps, rollbackSnaps_fn, _getRuntime, getRuntime_fn, _getRuntimeExpect, getRuntimeExpect_fn, _setupRuntime, setupRuntime_fn, _calculatePermissionsChange, calculatePermissionsChange_fn, _updatePermissions, updatePermissions_fn, _isValidUpdate, isValidUpdate_fn, _callLifecycleHook, callLifecycleHook_fn;
++var _closeAllConnections, _dynamicPermissions, _environmentEndowmentPermissions, _excludedPermissions, _featureFlags, _fetchFunction, _idleTimeCheckInterval, _maxIdleTime, _encryptor, _getMnemonic, _detectSnapLocation, _snapsRuntimeData, _rollbackSnapshots, _timeoutForLastRequestStatus, _statusMachine, _preinstalledSnaps, _initializeStateMachine, initializeStateMachine_fn, _registerMessageHandlers, registerMessageHandlers_fn, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn, _pollForLastRequestStatus, pollForLastRequestStatus_fn, _blockSnap, blockSnap_fn, _unblockSnap, unblockSnap_fn, _assertIsInstallAllowed, assertIsInstallAllowed_fn, _stopSnapsLastRequestPastMax, stopSnapsLastRequestPastMax_fn, _transition, transition_fn, _terminateSnap, terminateSnap_fn, _getSnapEncryptionKey, getSnapEncryptionKey_fn, _decryptSnapState, decryptSnapState_fn, _encryptSnapState, encryptSnapState_fn, _handleInitialConnections, handleInitialConnections_fn, _addSnapToSubject, addSnapToSubject_fn, _removeSnapFromSubjects, removeSnapFromSubjects_fn, _revokeAllSnapPermissions, revokeAllSnapPermissions_fn, _createApproval, createApproval_fn, _updateApproval, updateApproval_fn, _resolveAllowlistVersion, resolveAllowlistVersion_fn, _add, add_fn, _startSnap, startSnap_fn, _getEndowments, getEndowments_fn, _set, set_fn, _validateSnapPermissions, validateSnapPermissions_fn, _getExecutionTimeout, getExecutionTimeout_fn, _getRpcRequestHandler, getRpcRequestHandler_fn, _createInterface, createInterface_fn, _assertInterfaceExists, assertInterfaceExists_fn, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn, _recordSnapRpcRequestStart, recordSnapRpcRequestStart_fn, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn, _getRollbackSnapshot, getRollbackSnapshot_fn, _createRollbackSnapshot, createRollbackSnapshot_fn, _rollbackSnap, rollbackSnap_fn, _rollbackSnaps, rollbackSnaps_fn, _getRuntime, getRuntime_fn, _getRuntimeExpect, getRuntimeExpect_fn, _setupRuntime, setupRuntime_fn, _calculatePermissionsChange, calculatePermissionsChange_fn, _updatePermissions, updatePermissions_fn, _isValidUpdate, isValidUpdate_fn, _callLifecycleHook, callLifecycleHook_fn;
+ var SnapController = class extends _basecontroller.BaseController {
+   constructor({
+     closeAllConnections,
+@@ -132,7 +132,7 @@ var SnapController = class extends _basecontroller.BaseController {
+     fetchFunction = globalThis.fetch.bind(globalThis),
+     featureFlags = {},
+     detectSnapLocation: detectSnapLocationFunction = _chunkPT22IXNSjs.detectSnapLocation,
+-    preinstalledSnaps,
++    preinstalledSnaps = null,
+     encryptor,
+     getMnemonic
+   }) {
+@@ -448,6 +448,7 @@ var SnapController = class extends _basecontroller.BaseController {
+     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _rollbackSnapshots, void 0);
+     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _timeoutForLastRequestStatus, void 0);
+     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _statusMachine, void 0);
++    _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _preinstalledSnaps, void 0);
+     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _closeAllConnections, closeAllConnections);
+     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _dynamicPermissions, dynamicPermissions);
+     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _environmentEndowmentPermissions, environmentEndowmentPermissions);
+@@ -460,6 +461,7 @@ var SnapController = class extends _basecontroller.BaseController {
+     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _detectSnapLocation, detectSnapLocationFunction);
+     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _encryptor, encryptor);
+     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _getMnemonic, getMnemonic);
++    _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _preinstalledSnaps, preinstalledSnaps);
+     this._onUnhandledSnapError = this._onUnhandledSnapError.bind(this);
+     this._onOutboundRequest = this._onOutboundRequest.bind(this);
+     this._onOutboundResponse = this._onOutboundResponse.bind(this);
+@@ -498,8 +500,8 @@ var SnapController = class extends _basecontroller.BaseController {
+     });
+     _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _initializeStateMachine, initializeStateMachine_fn).call(this);
+     _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
+-    if (preinstalledSnaps) {
+-      _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn).call(this, preinstalledSnaps);
++    if (_chunkEXN2TFDJjs.__privateGet.call(void 0, this, _preinstalledSnaps)) {
++      _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn).call(this, _chunkEXN2TFDJjs.__privateGet.call(void 0, this, _preinstalledSnaps));
+     }
+     Object.values(this.state?.snaps ?? {}).forEach(
+       (snap) => _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _setupRuntime, setupRuntime_fn).call(this, snap.id)
+@@ -801,6 +803,13 @@ var SnapController = class extends _basecontroller.BaseController {
+       state.snaps = {};
+       state.snapStates = {};
+     });
++    _chunkEXN2TFDJjs.__privateGet.call(void 0, this, _snapsRuntimeData).clear();
++    if (_chunkEXN2TFDJjs.__privateGet.call(void 0, this, _preinstalledSnaps)) {
++      _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn).call(this, _chunkEXN2TFDJjs.__privateGet.call(void 0, this, _preinstalledSnaps));
++      Object.values(this.state?.snaps).forEach(
++        (snap) => _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _setupRuntime, setupRuntime_fn).call(this, snap.id)
++      );
++    }
+   }
+   /**
+    * Removes the given snap from state, and clears all associated handlers
+@@ -1420,6 +1429,7 @@ _snapsRuntimeData = new WeakMap();
+ _rollbackSnapshots = new WeakMap();
+ _timeoutForLastRequestStatus = new WeakMap();
+ _statusMachine = new WeakMap();
++_preinstalledSnaps = new WeakMap();
+ _initializeStateMachine = new WeakSet();
+ initializeStateMachine_fn = function() {
+   const disableGuard = ({ snapId }) => {
+@@ -2434,4 +2444,5 @@ callLifecycleHook_fn = async function(snapId, handler) {
+ 
+ 
+ exports.controllerName = controllerName; exports.SNAP_APPROVAL_INSTALL = SNAP_APPROVAL_INSTALL; exports.SNAP_APPROVAL_UPDATE = SNAP_APPROVAL_UPDATE; exports.SNAP_APPROVAL_RESULT = SNAP_APPROVAL_RESULT; exports.SnapController = SnapController;
++
+ //# sourceMappingURL=chunk-JMP6XYRL.js.map
+\ No newline at end of file
diff --git a/.yarn/patches/@spruceid-siwe-parser-npm-2.1.0-060b7ede7a.patch b/.yarn/patches/@spruceid-siwe-parser-npm-2.1.0-060b7ede7a.patch
new file mode 100644
index 000000000000..220b6f5d6baf
--- /dev/null
+++ b/.yarn/patches/@spruceid-siwe-parser-npm-2.1.0-060b7ede7a.patch
@@ -0,0 +1,51 @@
+diff --git a/dist/abnf.js b/dist/abnf.js
+index 15caf986714ddc2276571d17c35bf392941fa346..0eeac1eeb94284e201fb0bbaea887c0f3d060aaa 100644
+--- a/dist/abnf.js
++++ b/dist/abnf.js
+@@ -290,9 +290,6 @@ class ParsedMessage {
+         if (this.domain.length === 0) {
+             throw new Error("Domain cannot be empty.");
+         }
+-        if (!(0, utils_1.isEIP55Address)(this.address)) {
+-            throw new Error("Address not conformant to EIP-55.");
+-        }
+     }
+ }
+ exports.ParsedMessage = ParsedMessage;
+diff --git a/dist/regex.js b/dist/regex.js
+index 4740a7c271db7fb2b5f0885727053e1165e8e392..cbfa067030a975ae645ef68baa3b963059e89f2c 100644
+--- a/dist/regex.js
++++ b/dist/regex.js
+@@ -55,9 +55,7 @@ class ParsedMessage {
+             throw new Error("Domain cannot be empty.");
+         }
+         this.address = (_b = match === null || match === void 0 ? void 0 : match.groups) === null || _b === void 0 ? void 0 : _b.address;
+-        if (!(0, utils_1.isEIP55Address)(this.address)) {
+-            throw new Error("Address not conformant to EIP-55.");
+-        }
++
+         this.statement = (_c = match === null || match === void 0 ? void 0 : match.groups) === null || _c === void 0 ? void 0 : _c.statement;
+         this.uri = (_d = match === null || match === void 0 ? void 0 : match.groups) === null || _d === void 0 ? void 0 : _d.uri;
+         if (!uri.isUri(this.uri)) {
+diff --git a/lib/abnf.ts b/lib/abnf.ts
+index a7e5fcfaefdf39bac8bf0b5ee2d6e12cee4b07f0..6d022a2bd17ec5d7158b34e978a946465520aa74 100644
+--- a/lib/abnf.ts
++++ b/lib/abnf.ts
+@@ -1,6 +1,6 @@
+ import apgApi from "apg-js/src/apg-api/api";
+ import apgLib from "apg-js/src/apg-lib/node-exports";
+-import { isEIP55Address, parseIntegerNumber } from "./utils";
++import { parseIntegerNumber } from "./utils";
+ 
+ const GRAMMAR = `
+ sign-in-with-ethereum =
+@@ -358,9 +358,5 @@ export class ParsedMessage {
+ 		if (this.domain.length === 0) {
+ 			throw new Error("Domain cannot be empty.");
+ 		}
+-
+-		if (!isEIP55Address(this.address)) {
+-			throw new Error("Address not conformant to EIP-55.");
+-		}
+ 	}
+ }
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 374745715f05..adc73de8f717 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -43,7 +43,6 @@ npmAuditIgnoreAdvisories:
   # not appear to be used.
   - 1092461
 
-
   # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix
   # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299
   - 'ts-custom-error (deprecation)'
@@ -93,7 +92,7 @@ npmAuditIgnoreAdvisories:
   # MetaMask owned repositories brought in by other MetaMask dependencies that
   # can be resolved by updating the versions throughout the dependency tree
   - 'eth-sig-util (deprecation)' # via @metamask/eth-ledger-bridge-keyring
-  - '@metamask/controller-utils (deprecation)' # via @metamask/phishin-controller
+  - '@metamask/controller-utils (deprecation)' # via @metamask/phishing-controller
   - 'safe-event-emitter (deprecation)' # via eth-block-tracker and others
 
   # @metamask-institutional relies upon crypto which is deprecated
@@ -126,18 +125,18 @@ npmAuditIgnoreAdvisories:
   - '@metamask/snaps-ui (deprecation)'
 
 npmRegistries:
-  "https://npm.pkg.github.com":
+  'https://npm.pkg.github.com':
     npmAlwaysAuth: true
-    npmAuthToken: "${GITHUB_PACKAGE_READ_TOKEN-}"
+    npmAuthToken: '${GITHUB_PACKAGE_READ_TOKEN-}'
 
 npmScopes:
   metamask:
-    npmRegistryServer: "${METAMASK_NPM_REGISTRY:-https://registry.yarnpkg.com}"
+    npmRegistryServer: '${METAMASK_NPM_REGISTRY:-https://registry.yarnpkg.com}'
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
-    spec: "https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js"
+    spec: 'https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js'
   - path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
-    spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"
+    spec: 'https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js'
 
 yarnPath: .yarn/releases/yarn-4.0.2.cjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4dd8ff84720f..7ca4b44f8527 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.17.0]
+
 ## [11.14.4]
 ### Fixed
 - Fix bug that could cause safe-transfer-from transactions to be converted to transfer-from transactions, by removing the edit button on the safe-transfer-from confirmation screens ([#24287](https://github.com/MetaMask/metamask-extension/pull/24287))
@@ -4625,7 +4627,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.14.4...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.17.0...HEAD
+[11.17.0]: https://github.com/MetaMask/metamask-extension/compare/v11.14.4...v11.17.0
 [11.14.4]: https://github.com/MetaMask/metamask-extension/compare/v11.14.3...v11.14.4
 [11.14.3]: https://github.com/MetaMask/metamask-extension/compare/v11.14.2...v11.14.3
 [11.14.2]: https://github.com/MetaMask/metamask-extension/compare/v11.14.1...v11.14.2
diff --git a/README.md b/README.md
index d9a31a86a8b0..41f53ba99d53 100644
--- a/README.md
+++ b/README.md
@@ -117,20 +117,21 @@ Before running e2e tests, ensure you've run `yarn install` to download dependenc
 
 1. Use `yarn download-builds:test` to quickly download and unzip test builds for Chrome and Firefox into the `./dist/` folder. This method is fast and convenient for standard testing.
 2. Create a custom test build: for testing against different build types, use `yarn build:test`. This command allows you to generate test builds for various types, including:
-    - `yarn build:test` for main build
-    - `yarn build:test:flask` for flask build
-    - `yarn build:test:mmi` for mmi build
-    - `yarn build:test:mv3` for mv3 build
-3. Start a test build with live changes: `yarn start:test` is particularly useful for development. It starts a test build that automatically recompiles application code upon changes.This option is ideal for iterative testing and development.
-This command also allows you to generate test builds for various types, including:
-    - `yarn start:test` for main build
-    - `yarn start:test:flask` for flask build
-    - `yarn start:test:mv3` for mv3 build
+   - `yarn build:test` for main build
+   - `yarn build:test:flask` for flask build
+   - `yarn build:test:mmi` for mmi build
+   - `yarn build:test:mv3` for mv3 build
+3. Start a test build with live changes: `yarn start:test` is particularly useful for development. It starts a test build that automatically recompiles application code upon changes. This option is ideal for iterative testing and development. This command also allows you to generate test builds for various types, including:
+   - `yarn start:test` for main build
+   - `yarn start:test:flask` for flask build
+   - `yarn start:test:mv3` for mv3 build
 
 Note: The `yarn start:test` command (which initiates the testDev build type) has LavaMoat disabled for both the build system and the application, offering a streamlined testing experience during development. On the other hand, `yarn build:test` enables LavaMoat for enhanced security in both the build system and application, mirroring production environments more closely.
 
 #### Running Tests
+
 Once you have your test build ready, choose the browser for your e2e tests:
+
 - For Firefox, run `yarn test:e2e:firefox`.
 - For Chrome, run `yarn test:e2e:chrome`.
 
@@ -141,10 +142,11 @@ These scripts support additional options for debugging. Use `--help`to see all a
 Single e2e tests can be run with `yarn test:e2e:single test/e2e/tests/TEST_NAME.spec.js` along with the options below.
 
 ```console
-  --browser           Set the browser used; either 'chrome' or 'firefox'.
-                                            [string] [choices: "chrome", "firefox"]
+  --browser           Set the browser to be used; specify 'chrome', 'firefox', 'all'
+                      or leave unset to run on 'all' by default.
+                                                          [string] [default: 'all']
   --debug             Run tests in debug mode, logging each driver interaction
-                                                         [boolean] [default: false]
+                                                         [boolean] [default: true]
   --retries           Set how many times the test should be retried upon failure.
                                                               [number] [default: 0]
   --leave-running     Leaves the browser running after a test fails, along with
@@ -155,10 +157,10 @@ Single e2e tests can be run with `yarn test:e2e:single test/e2e/tests/TEST_NAME.
 ```
 
 For example, to run the `account-details` tests using Chrome, with debug logging and with the browser set to remain open upon failure, you would use:
-`yarn test:e2e:single test/e2e/tests/account-menu/account-details.spec.js --browser=chrome --debug --leave-running`
-
+`yarn test:e2e:single test/e2e/tests/account-menu/account-details.spec.js --browser=chrome --leave-running`
 
 #### Running e2e tests against specific feature flag
+
 While developing new features, we often use feature flags. As we prepare to make these features generally available (GA), we remove the feature flags. Existing feature flags are listed in the `.metamaskrc.dist` file. To execute e2e tests with a particular feature flag enabled, it's necessary to first generate a test build with that feature flag activated. There are two ways to achieve this:
 
 - To enable a feature flag in your local configuration, you should first ensure you have a `.metamaskrc` file copied from `.metamaskrc.dist`. Then, within your local `.metamaskrc` file, you can set the desired feature flag to true. Following this, a test build with the feature flag enabled can be created by executing `yarn build:test`.
@@ -166,7 +168,7 @@ While developing new features, we often use feature flags. As we prepare to make
 - Alternatively, for enabling a feature flag directly during the test build creation, you can pass the parameter as true via the command line. For instance, activating the MULTICHAIN feature flag can be done by running `MULTICHAIN=1 yarn build:test` or `MULTICHAIN=1 yarn start:test` . This method allows for quick adjustments to feature flags without altering the `.metamaskrc` file.
 
 Once you've created a test build with the desired feature flag enabled, proceed to run your tests as usual. Your tests will now run against the version of the extension with the specific feature flag activated. For example:
-`yarn test:e2e:single test/e2e/tests/account-menu/account-details.spec.js --browser=chrome --debug --leave-running`
+`yarn test:e2e:single test/e2e/tests/account-menu/account-details.spec.js --browser=chrome`
 
 This approach ensures that your e2e tests accurately reflect the user experience for the upcoming GA features.
 
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index d7283cacf04b..824c64b10fe6 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -348,19 +348,10 @@
     "message": "Alle Ihre NFTs von $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": "Erlauben dieser externen Erweiterung auf:"
-  },
   "allowSpendToken": {
     "message": "Genehmigung zum Zugriff auf Ihr $1 erteilen?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Erlauben Sie dieser Seite:"
-  },
-  "allowThisSnapTo": {
-    "message": "Erlauben Sie diesem Snap Folgendes:"
-  },
   "allowWithdrawAndSpend": {
     "message": "$1 erlauben, bis zu dem folgenden Betrag abzuheben und auszugeben:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "Mit $1 verbinden",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Verbindung mit $1 wird hergestellt",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Mit all Ihren $1 verbinden",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "Konten",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Verbindung mit $1 wird hergestellt",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1-Konten",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Mit MetaMask verbinden"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Allgemein"
   },
-  "globalTitle": {
-    "message": "Globales Menü"
-  },
-  "globalTourDescription": {
-    "message": "Sehen Sie Ihr Portfolio, verbundene Seiten, Einstellungen und mehr."
-  },
   "goBack": {
     "message": "Zurück"
   },
@@ -2707,7 +2672,8 @@
     "message": "Ein betrügerischer Netzwerkanbieter kann bezüglich des Status der Blockchain täuschen und Ihre Netzwerkaktivitäten aufzeichnen. Fügen Sie nur vertrauenswürdige Netzwerke hinzu."
   },
   "onlyConnectTrust": {
-    "message": "Verbinden Sie sich nur mit Seiten, denen Sie vertrauen."
+    "message": "Verbinden Sie sich nur mit Seiten, denen Sie vertrauen.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Öffnen Sie MetaMask im Vollbildmodus, um Ihren Ledger über WebHID zu verbinden.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Genehmigungsanfrage"
   },
-  "permissionRequestCapitalized": {
-    "message": "Genehmigungsanfrage"
-  },
   "permissionRequested": {
     "message": "Jetzt angefragt"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "Genehmigungen"
   },
-  "permissionsTitle": {
-    "message": "Genehmigungen"
-  },
-  "permissionsTourDescription": {
-    "message": "Hier können Sie Ihre verbundenen Konten finden und Berechtigungen verwalten."
-  },
   "personalAddressDetected": {
     "message": "Personalisierte Adresse identifiziert. Bitte füge die Token-Contract-Adresse ein."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Smart Contracts"
   },
-  "smartSwapsAreHere": {
-    "message": "Die Smart Swaps sind da!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps ist jetzt wesentlich intelligenter! Die Aktivierung von Smart Swaps wird es MetaMask erlauben, Ihre Swaps programmatisch zu optimieren, um zu helfen:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Nicht genügend Gelder für einen Smart Swap."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Webseite"
   },
-  "snapInstallRequest": {
-    "message": "Durch die Installation von $1 werden folgende Genehmigungen erteilt. Nur fortfahren, wenn Sie $1 vertrauen.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Installation ist abgeschlossen"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Stark"
   },
-  "stxBenefit1": {
-    "message": "Transaktionskosten minimieren"
-  },
-  "stxBenefit2": {
-    "message": "Transaktionsausfälle reduzieren"
-  },
-  "stxBenefit3": {
-    "message": "Steckengebliebene Transaktionen eliminieren"
-  },
-  "stxBenefit4": {
-    "message": "Front-Running verhindern"
-  },
   "stxCancelled": {
     "message": "Swap wäre gescheitert"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Sie haben gewechselt zu"
   },
-  "switcherTitle": {
-    "message": "Netzwerkwechsler"
-  },
-  "switcherTourDescription": {
-    "message": "Klicken Sie auf das Symbol, um das Netzwerk zu wechseln oder ein neues Netzwerk hinzuzufügen."
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Das Wechseln der Netzwerke wird alle ausstehenden Bestätigungen stornieren."
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Zeige $1 bei $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "$1 auf Etherscan anzeigen",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "Was ist das?"
   },
-  "xOfY": {
-    "message": "$1 von $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 von $2 ausstehend",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 676378aa3946..430440d432f4 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -348,19 +348,10 @@
     "message": "Όλα τα NFT σας από το $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": "Επιτρέψτε σε αυτή την εξωτερική επέκταση να:"
-  },
   "allowSpendToken": {
     "message": "Δίνετε άδεια για να αποκτήσετε πρόσβαση στο $1;",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Επιτρέψτε σε αυτόν τον ιστότοπο να:"
-  },
-  "allowThisSnapTo": {
-    "message": "Επιτρέψτε αυτό το snap να:"
-  },
   "allowWithdrawAndSpend": {
     "message": "Επιτρέψτε στο $1 να κάνει ανάληψη και να ξοδέψει μέχρι το ακόλουθο ποσό:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "Σύνδεση $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Σύνδεση με $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Συνδεθείτε σε όλα τα $1 σας",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "λογαριασμοί",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Σύνδεση με $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 λογαριασμοί",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Σύνδεση με το MetaMask"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Γενικά"
   },
-  "globalTitle": {
-    "message": "Γενικό μενού"
-  },
-  "globalTourDescription": {
-    "message": "Δείτε το χαρτοφυλάκιό σας, τις συνδεδεμένες ιστοσελίδες, τις ρυθμίσεις και πολλά άλλα"
-  },
   "goBack": {
     "message": "Πηγαίνετε πίσω"
   },
@@ -2707,7 +2672,8 @@
     "message": "Ένας κακόβουλος πάροχος δικτύου μπορεί να πει ψέματα σχετικά με την κατάσταση του blockchain και να καταγράψει τη δραστηριότητα του δικτύου σας. Προσθέστε μόνο προσαρμοσμένα δίκτυα που εμπιστεύεστε."
   },
   "onlyConnectTrust": {
-    "message": "Συνδεθείτε μόνο με ιστότοπους που εμπιστεύεστε."
+    "message": "Συνδεθείτε μόνο με ιστότοπους που εμπιστεύεστε.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Μεταβείτε σε πλήρη οθόνη για να συνδέσετε το Ledger σας.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Αίτημα άδειας"
   },
-  "permissionRequestCapitalized": {
-    "message": "Αίτημα άδειας"
-  },
   "permissionRequested": {
     "message": "Ζητήθηκε τώρα"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "Άδειες"
   },
-  "permissionsTitle": {
-    "message": "Άδειες"
-  },
-  "permissionsTourDescription": {
-    "message": "Βρείτε τους συνδεδεμένους λογαριασμούς σας και διαχειριστείτε τις άδειες εδώ"
-  },
   "personalAddressDetected": {
     "message": "Η προσωπική διεύθυνση εντοπίστηκε. Καταχωρίστε τη διεύθυνση συμβολαίου του token."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Έξυπνα συμβόλαια"
   },
-  "smartSwapsAreHere": {
-    "message": "Οι Έξυπνες Ανταλλαγές είναι εδώ!"
-  },
-  "smartSwapsDescription": {
-    "message": "Οι Ανταλλαγές στο MetaMask μόλις έγιναν πολύ πιο έξυπνες! Η ενεργοποίηση των Έξυπνων Ανταλλαγών θα επιτρέψει στο MetaMask να βελτιστοποιήσει προγραμματιστικά τις Ανταλλαγές σας, ώστε να σας βοηθήσει:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Δεν υπάρχουν αρκετά κεφάλαια για έξυπνες ανταλλαγές."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Ιστότοπος"
   },
-  "snapInstallRequest": {
-    "message": "Με την εγκατάσταση, εκχωρούνται στο $1 οι ακόλουθες άδειες. Συνεχίστε μόνο αν εμπιστεύεστε το $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Η εγκατάσταση ολοκληρώθηκε"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Ισχυρό"
   },
-  "stxBenefit1": {
-    "message": "Ελαχιστοποίηση του κόστους συναλλαγών"
-  },
-  "stxBenefit2": {
-    "message": "Μείωση των αποτυχημένων συναλλαγών"
-  },
-  "stxBenefit3": {
-    "message": "Εξάλειψη των εμπλοκών στις συναλλαγές"
-  },
-  "stxBenefit4": {
-    "message": "Αποτροπή των προπορευόμενων συναλλαγών (front-running)"
-  },
   "stxCancelled": {
     "message": "Η ανταλλαγή θα είχε αποτύχει"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Έχετε αλλάξει σε"
   },
-  "switcherTitle": {
-    "message": "Επιλογέας δικτύου"
-  },
-  "switcherTourDescription": {
-    "message": "Κάντε κλικ στο εικονίδιο για να αλλάξετε δίκτυο ή να προσθέσετε ένα νέο δίκτυο"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Η αλλαγή δικτύων θα ακυρώσει όλες τις εκκρεμείς επιβεβαιώσεις"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Προβολή $1 στο $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Προβολή $1 στο Etherscan",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "Τι είναι αυτό;"
   },
-  "xOfY": {
-    "message": "$1 από $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 από $2 σε εκκρεμότητα",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index db38fa50d0fc..51aaaf492ced 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -340,9 +340,18 @@
   "airgapVault": {
     "message": "AirGap Vault"
   },
+  "alert": {
+    "message": "Alert"
+  },
   "alertDisableTooltip": {
     "message": "This can be changed in \"Settings > Alerts\""
   },
+  "alertModalAcknowledge": {
+    "message": "I have acknowledged the risk and still want to proceed"
+  },
+  "alertModalDetails": {
+    "message": "Alert Details"
+  },
   "alertSettingsUnconnectedAccount": {
     "message": "Browsing a website with an unconnected account selected"
   },
@@ -378,9 +387,6 @@
   "allow": {
     "message": "Allow"
   },
-  "allowExternalExtensionTo": {
-    "message": "Allow this external extension to:"
-  },
   "allowMmiToConnectToCustodian": {
     "message": "This will allow MMI to connect to $1 to import your accounts."
   },
@@ -388,12 +394,6 @@
     "message": "Give permission to access your $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Allow this site to:"
-  },
-  "allowThisSnapTo": {
-    "message": "Allow this snap to:"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -409,6 +409,9 @@
     "message": "$1 and $2",
     "description": "$1 is the first item, $2 is the second item. Used in Snap Install Warning modal."
   },
+  "announcements": {
+    "message": "Announcements"
+  },
   "appDescription": {
     "message": "An Ethereum Wallet in your Browser",
     "description": "The description of the application"
@@ -562,6 +565,33 @@
   "basic": {
     "message": "Basic"
   },
+  "basicConfigurationBannerCTA": {
+    "message": "Turn on basic functionality"
+  },
+  "basicConfigurationBannerTitle": {
+    "message": "Basic functionality is off"
+  },
+  "basicConfigurationDescription": {
+    "message": "Includes token data and value, optimal gas settings, and more. Using these services shares your IP address with MetaMask, just like when you visit a website."
+  },
+  "basicConfigurationLabel": {
+    "message": "Basic functionality"
+  },
+  "basicConfigurationModalCheckbox": {
+    "message": "I understand and want to continue"
+  },
+  "basicConfigurationModalDisclaimerOff": {
+    "message": "This means you won't fully optimize your time on MetaMask. Basic features (like token details, optimal gas settings, and others) won't be available to you."
+  },
+  "basicConfigurationModalDisclaimerOn": {
+    "message": "To optimize your time on MetaMask, you’ll need to turn on this feature. Basic functions (like token details, optimal gas settings, and others) are important to the web3 experience."
+  },
+  "basicConfigurationModalHeadingOff": {
+    "message": "Turn off basic functionality"
+  },
+  "basicConfigurationModalHeadingOn": {
+    "message": "Turn on basic functionality"
+  },
   "beCareful": {
     "message": "Be careful"
   },
@@ -619,7 +649,7 @@
     "message": "If you approve this request, someone can steal your assets listed on Blur."
   },
   "blockaidDescriptionErrored": {
-    "message": "Because of an error, this request was not verified by the security provider. Proceed with caution."
+    "message": "Because of an error, we couldn't check for security alerts. Only continue if you trust every address involved."
   },
   "blockaidDescriptionMaliciousDomain": {
     "message": "You're interacting with a malicious domain. If you approve this request, you might lose your assets."
@@ -640,7 +670,7 @@
     "message": "This is a deceptive request"
   },
   "blockaidTitleMayNotBeSafe": {
-    "message": "Request may not be safe"
+    "message": "Be careful"
   },
   "blockaidTitleSuspicious": {
     "message": "This is a suspicious request"
@@ -666,9 +696,6 @@
   "busy": {
     "message": "Busy"
   },
-  "buy": {
-    "message": "Buy"
-  },
   "buyAndSell": {
     "message": "Buy & Sell"
   },
@@ -683,6 +710,10 @@
   "buyNow": {
     "message": "Buy Now"
   },
+  "buyToken": {
+    "message": "Buy $1",
+    "description": "$1 is the token symbol"
+  },
   "bytes": {
     "message": "Bytes"
   },
@@ -759,6 +790,9 @@
   "close": {
     "message": "Close"
   },
+  "closeExtension": {
+    "message": "Close extension"
+  },
   "coingecko": {
     "message": "CoinGecko"
   },
@@ -799,15 +833,18 @@
   "confirmRecoveryPhrase": {
     "message": "Confirm Secret Recovery Phrase"
   },
-  "confirmTitleDescPersonalSignature": {
-    "message": "Only sign this message if you fully understand the content and trust the requesting site"
+  "confirmTitleDescContractInteractionTransaction": {
+    "message": "Only confirm this transaction if you fully understand the content and trust the requesting site."
   },
-  "confirmTitleDescTypedDataSignature": {
-    "message": "Review everything below before continuing. Once done, this transaction can’t be undone"
+  "confirmTitleDescSignature": {
+    "message": "Only confirm this message if you approve the content and trust the requesting site."
   },
   "confirmTitleSignature": {
     "message": "Signature request"
   },
+  "confirmTitleTransaction": {
+    "message": "Transaction request"
+  },
   "confirmed": {
     "message": "Confirmed"
   },
@@ -854,26 +891,6 @@
     "message": "Connect $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Connect to $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Connect to all your $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "accounts",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Connect to $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 accounts",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Connect with MetaMask"
   },
@@ -894,6 +911,9 @@
     "message": "$1 can see the account balance, address, activity, and suggest transactions to approve for connected accounts.",
     "description": "$1 is the origin name"
   },
+  "connectedAccountsToast": {
+    "message": "Connected accounts updated"
+  },
   "connectedSites": {
     "message": "Connected sites"
   },
@@ -911,11 +931,8 @@
   "connectedWith": {
     "message": "Connected with"
   },
-  "connectedaccountsTabKey": {
-    "message": "Connected accounts"
-  },
   "connecting": {
-    "message": "Connecting..."
+    "message": "Connecting"
   },
   "connectingTo": {
     "message": "Connecting to $1"
@@ -1106,6 +1123,12 @@
   "custodianAccountAddedTitle": {
     "message": "Selected $1 accounts have been added."
   },
+  "custodianQRCodeScan": {
+    "message": "Scan QR code with your $1 mobile app"
+  },
+  "custodianQRCodeScanDescription": {
+    "message": "Or log into your $1 account and click on the 'Connect to MMI' button"
+  },
   "custodianReplaceRefreshTokenChangedFailed": {
     "message": "Please go to $1 and click the 'Connect to MMI' button within their user interface to connect your accounts to MMI again."
   },
@@ -1386,6 +1409,18 @@
   "details": {
     "message": "Details"
   },
+  "developerOptions": {
+    "message": "Developer Options"
+  },
+  "developerOptionsResetStatesAnnouncementsDescription": {
+    "message": "Resets isShown boolean to false for all announcements. Announcements are the notifications shown in the What's New popup modal."
+  },
+  "developerOptionsResetStatesOnboarding": {
+    "message": "Resets various states related to onboarding and redirects to the \"Secure Your Wallet\" onboarding page."
+  },
+  "developerOptionsServiceWorkerKeepAlive": {
+    "message": "Results in a timestamp being continuously saved to session.storage"
+  },
   "disabledGasOptionToolTipMessage": {
     "message": "“$1” is disabled because it does not meet the minimum of a 10% increase from the original gas fee.",
     "description": "$1 is gas estimate type which can be market or aggressive"
@@ -1419,6 +1454,14 @@
   "disconnectThisAccount": {
     "message": "Disconnect this account"
   },
+  "disconnectedAllAccountsToast": {
+    "message": "All accounts disconnected from $1",
+    "description": "$1 is name of the dapp`"
+  },
+  "disconnectedSingleAccountToast": {
+    "message": "$1 disconnected from $2",
+    "description": "$1 is name of the name and $2 represents the dapp name`"
+  },
   "discoverSnaps": {
     "message": "Discover Snaps",
     "description": "Text that links to the Snaps website. Displayed in a banner on Snaps list page in settings."
@@ -1566,15 +1609,15 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Edit speed up gas fee"
   },
+  "enable": {
+    "message": "Enable"
+  },
   "enableAutoDetect": {
     "message": " Enable autodetect"
   },
   "enableFromSettings": {
     "message": " Enable it from Settings."
   },
-  "enableSmartSwaps": {
-    "message": "Enable Smart Swaps"
-  },
   "enableSnap": {
     "message": "Enable"
   },
@@ -1745,9 +1788,6 @@
   "failureMessage": {
     "message": "Something went wrong, and we were unable to complete the action"
   },
-  "faqAndRiskDisclosures": {
-    "message": "FAQ and Risk Disclosures"
-  },
   "fast": {
     "message": "Fast"
   },
@@ -1826,6 +1866,13 @@
   "functionType": {
     "message": "Function type"
   },
+  "fundYourWallet": {
+    "message": "Fund your wallet"
+  },
+  "fundYourWalletDescription": {
+    "message": "Get started by adding some $1 to your wallet.",
+    "description": "$1 is the token symbol"
+  },
   "gas": {
     "message": "Gas"
   },
@@ -1909,11 +1956,13 @@
   "genericExplorerView": {
     "message": "View account on $1"
   },
-  "globalTitle": {
-    "message": "Global menu"
+  "getStartedWithNFTs": {
+    "message": "Get $1 to buy NFTs",
+    "description": "$1 is the token symbol"
   },
-  "globalTourDescription": {
-    "message": "See your portfolio, connected sites, settings, and more"
+  "getStartedWithNFTsDescription": {
+    "message": "Get started with NFTs by adding some $1 to your wallet.",
+    "description": "$1 is the token symbol"
   },
   "goBack": {
     "message": "Go back"
@@ -2194,7 +2243,7 @@
     "message": "Install origin"
   },
   "installRequest": {
-    "message": "Installation request"
+    "message": "Add to MetaMask"
   },
   "installedOn": {
     "message": "Installed on $1",
@@ -2227,6 +2276,9 @@
   "interactingWith": {
     "message": "Interacting with"
   },
+  "interactingWithTransactionDescription": {
+    "message": "This is the contract you're interacting with. Protect yourself from scammers by  verifying the details."
+  },
   "invalidAddress": {
     "message": "Invalid address"
   },
@@ -2357,6 +2409,9 @@
   "layer1Fees": {
     "message": "Layer 1 fees"
   },
+  "layer2Fees": {
+    "message": "Layer 2 fees"
+  },
   "learnCancelSpeeedup": {
     "message": "Learn how to $1",
     "description": "$1 is link to cancel or speed up transactions"
@@ -2374,6 +2429,9 @@
   "learnMoreUpperCase": {
     "message": "Learn more"
   },
+  "learnMoreUpperCaseWithDot": {
+    "message": "Learn more."
+  },
   "learnScamRisk": {
     "message": "scams and security risks."
   },
@@ -2516,9 +2574,6 @@
     "message": "Make sure nobody is looking",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Manage in settings"
-  },
   "max": {
     "message": "Max"
   },
@@ -2569,6 +2624,12 @@
   "metamaskVersion": {
     "message": "MetaMask Version"
   },
+  "methodData": {
+    "message": "Method"
+  },
+  "methodDataTransactionDescription": {
+    "message": "This is the specific action that will be taken. This data can be faked, so be sure you trust the site on the other end."
+  },
   "methodNotSupported": {
     "message": "Not supported with this account."
   },
@@ -2617,7 +2678,7 @@
     "message": "more"
   },
   "multipleSnapConnectionWarning": {
-    "message": "$1 wants to connect with $2 snaps. Only proceed if you trust this website.",
+    "message": "$1 wants to use $2 Snaps",
     "description": "$1 is the dapp and $2 is the number of snaps it wants to connect to."
   },
   "mustSelectOne": {
@@ -2682,6 +2743,10 @@
     "message": "Choose a nickname...",
     "description": "Placeholder text for name input field in name component modal."
   },
+  "nativePermissionRequestDescription": {
+    "message": "Do you want this site to do the following?",
+    "description": "Description below header used on Permission Connect screen for native permissions."
+  },
   "nativeToken": {
     "message": "The native token on this network is $1. It is the token used for gas fees. ",
     "description": "$1 represents the name of the native token on the current network"
@@ -2877,9 +2942,6 @@
   "nftDisclaimer": {
     "message": "Disclaimer: MetaMask pulls the media file from the source url. This url sometimes gets changed by the marketplace on which the NFT was minted."
   },
-  "nftLearnMore": {
-    "message": "Learn more about NFTs"
-  },
   "nftOptions": {
     "message": "NFT Options"
   },
@@ -2936,6 +2998,9 @@
   "noSnaps": {
     "message": "You don't have any snaps installed."
   },
+  "noThanks": {
+    "message": "No thanks"
+  },
   "noTransactions": {
     "message": "You have no transactions"
   },
@@ -2945,6 +3010,9 @@
   "noWebcamFoundTitle": {
     "message": "Webcam not found"
   },
+  "nonCustodialAccounts": {
+    "message": "MetaMask Institutional allows you to use non-custodial accounts, if you plan to use these accounts backup the Secret Recovery Phrase."
+  },
   "nonce": {
     "message": "Nonce"
   },
@@ -3062,6 +3130,14 @@
   "notificationsEmptyText": {
     "message": "This is where you can find notifications from your installed snaps."
   },
+  "notificationsFeatureToggle": {
+    "message": "Enable Wallet Notifications",
+    "description": "Experimental feature title"
+  },
+  "notificationsFeatureToggleDescription": {
+    "message": "This enables wallet notifications like send/receive funds or nfts and feature announcements.",
+    "description": "Description of the experimental notifications feature"
+  },
   "notificationsHeader": {
     "message": "Notifications"
   },
@@ -3147,6 +3223,9 @@
   "on": {
     "message": "On"
   },
+  "onboarding": {
+    "message": "Onboarding"
+  },
   "onboardingAdvancedPrivacyIPFSDescription": {
     "message": "The IPFS gateway makes it possible to access and view data hosted by third parties. You can add a custom IPFS gateway or continue using the default."
   },
@@ -3273,7 +3352,8 @@
     "message": "A malicious network provider can lie about the state of the blockchain and record your network activity. Only add custom networks you trust."
   },
   "onlyConnectTrust": {
-    "message": "Only connect with sites you trust."
+    "message": "Only connect with sites you trust. $1",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openCustodianApp": {
     "message": "Open $1 app",
@@ -3301,9 +3381,6 @@
   "operationFailed": {
     "message": "Operation Failed"
   },
-  "optimismFees": {
-    "message": "Optimism fees"
-  },
   "optional": {
     "message": "Optional"
   },
@@ -3396,9 +3473,6 @@
   "permissionRequest": {
     "message": "Permission request"
   },
-  "permissionRequestCapitalized": {
-    "message": "Permission request"
-  },
   "permissionRequested": {
     "message": "Requested now"
   },
@@ -3628,12 +3702,6 @@
   "permissionsPageTourTitle": {
     "message": "Connected sites are now permissions"
   },
-  "permissionsTitle": {
-    "message": "Permissions"
-  },
-  "permissionsTourDescription": {
-    "message": "Find your connected accounts and manage permissions here"
-  },
   "personalAddressDetected": {
     "message": "Personal address detected. Input the token contract address."
   },
@@ -3737,6 +3805,78 @@
   "publicAddress": {
     "message": "Public address"
   },
+  "pushPlatformNotificationsFundsReceivedDescription": {
+    "message": "You received $1 $2"
+  },
+  "pushPlatformNotificationsFundsReceivedDescriptionDefault": {
+    "message": "You received some tokens"
+  },
+  "pushPlatformNotificationsFundsReceivedTitle": {
+    "message": "Funds received"
+  },
+  "pushPlatformNotificationsFundsSentDescription": {
+    "message": "You successfully sent $1 $2"
+  },
+  "pushPlatformNotificationsFundsSentDescriptionDefault": {
+    "message": "You successfully sent some tokens"
+  },
+  "pushPlatformNotificationsFundsSentTitle": {
+    "message": "Funds sent"
+  },
+  "pushPlatformNotificationsNftReceivedDescription": {
+    "message": "You received new NFTs"
+  },
+  "pushPlatformNotificationsNftReceivedTitle": {
+    "message": "NFT received"
+  },
+  "pushPlatformNotificationsNftSentDescription": {
+    "message": "You have successfully sent an NFT"
+  },
+  "pushPlatformNotificationsNftSentTitle": {
+    "message": "NFT sent"
+  },
+  "pushPlatformNotificationsStakingLidoStakeCompletedDescription": {
+    "message": "Your Lido stake was successful"
+  },
+  "pushPlatformNotificationsStakingLidoStakeCompletedTitle": {
+    "message": "Stake complete"
+  },
+  "pushPlatformNotificationsStakingLidoStakeReadyToBeWithdrawnDescription": {
+    "message": "Your Lido stake is now ready to be withdrawn"
+  },
+  "pushPlatformNotificationsStakingLidoStakeReadyToBeWithdrawnTitle": {
+    "message": "Stake ready for withdrawal"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalCompletedDescription": {
+    "message": "Your Lido withdrawal was successful"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalCompletedTitle": {
+    "message": "Withdrawal completed"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalRequestedDescription": {
+    "message": "Your Lido withdrawal request was submitted"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalRequestedTitle": {
+    "message": "Withdrawal requested"
+  },
+  "pushPlatformNotificationsStakingRocketpoolStakeCompletedDescription": {
+    "message": "Your RocketPool stake was successful"
+  },
+  "pushPlatformNotificationsStakingRocketpoolStakeCompletedTitle": {
+    "message": "Stake complete"
+  },
+  "pushPlatformNotificationsStakingRocketpoolUnstakeCompletedDescription": {
+    "message": "Your RocketPool unstake was successful"
+  },
+  "pushPlatformNotificationsStakingRocketpoolUnstakeCompletedTitle": {
+    "message": "Unstake complete"
+  },
+  "pushPlatformNotificationsSwapCompletedDescription": {
+    "message": "Your MetaMask Swap was successful"
+  },
+  "pushPlatformNotificationsSwapCompletedTitle": {
+    "message": "Swap completed"
+  },
   "queued": {
     "message": "Queued"
   },
@@ -3755,6 +3895,9 @@
   "receive": {
     "message": "Receive"
   },
+  "receiveTokensCamelCase": {
+    "message": "Receive tokens"
+  },
   "recipientAddressPlaceholder": {
     "message": "Enter public address (0x) or ENS name"
   },
@@ -3788,6 +3931,12 @@
   "recoveryPhraseReminderTitle": {
     "message": "Protect your funds"
   },
+  "redesignedConfirmationsEnabledToggle": {
+    "message": "Improved signature requests"
+  },
+  "redesignedConfirmationsToggleDescription": {
+    "message": "Turn this on to see signature requests in an enhanced format."
+  },
   "refreshList": {
     "message": "Refresh list"
   },
@@ -3839,6 +3988,9 @@
   "removeNFT": {
     "message": "Remove NFT"
   },
+  "removeNftErrorMessage": {
+    "message": "We could not remove this NFT."
+  },
   "removeNftMessage": {
     "message": "NFT was successfully removed!"
   },
@@ -3876,6 +4028,9 @@
   "requestFromInfo": {
     "message": "This is the site asking for your signature."
   },
+  "requestFromTransactionDescription": {
+    "message": "This is the site asking for your confirmation."
+  },
   "requestMayNotBeSafe": {
     "message": "Request may not be safe"
   },
@@ -3897,6 +4052,9 @@
   "reset": {
     "message": "Reset"
   },
+  "resetStates": {
+    "message": "Reset States"
+  },
   "resetWallet": {
     "message": "Reset wallet"
   },
@@ -4218,6 +4376,9 @@
   "sepolia": {
     "message": "Sepolia test network"
   },
+  "serviceWorkerKeepAlive": {
+    "message": "Service Worker Keep Alive"
+  },
   "setAdvancedPrivacySettingsDetails": {
     "message": "MetaMask uses these trusted third-party services to enhance product usability and safety."
   },
@@ -4353,12 +4514,6 @@
   "simulationsSettingSubHeader": {
     "message": "Estimate balance changes"
   },
-  "siteConnections": {
-    "message": "Site Connections"
-  },
-  "sites": {
-    "message": "Sites"
-  },
   "skip": {
     "message": "Skip"
   },
@@ -4371,28 +4526,58 @@
   "smartContracts": {
     "message": "Smart contracts"
   },
-  "smartSwaps": {
-    "message": "Smart Swaps"
-  },
-  "smartSwapsAreHere": {
-    "message": "Smart Swaps are here!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps just got a whole lot smarter! Enabling Smart Swaps will allow MetaMask to programmatically optimize your Swap to help:"
-  },
-  "smartSwapsDescription2": {
-    "message": "*Smart Swaps will submit your transaction privately. You can opt-out in advanced settings at any time. To learn more about Smart Swaps, read our $1.",
-    "description": "$1 is an external link to FAQ and Risk Disclosures"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Not enough funds for a smart swap."
   },
   "smartSwapsErrorUnavailable": {
     "message": "Smart Swaps are temporarily unavailable."
   },
-  "smartSwapsTooltip": {
-    "message": "Simulate transactions before submitting to decrease transaction costs and reduce failures. To learn more, read our $1",
-    "description": "$1 is an external link to FAQ and Risk Disclosures"
+  "smartTransactionCancelled": {
+    "message": "Your transaction was canceled"
+  },
+  "smartTransactionCancelledDescription": {
+    "message": "Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees."
+  },
+  "smartTransactionError": {
+    "message": "Your transaction failed"
+  },
+  "smartTransactionErrorDescription": {
+    "message": "Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support."
+  },
+  "smartTransactionPending": {
+    "message": "Submitting your transaction"
+  },
+  "smartTransactionSuccess": {
+    "message": "Your transaction is complete"
+  },
+  "smartTransactionTakingTooLong": {
+    "message": "Sorry for the wait"
+  },
+  "smartTransactionTakingTooLongDescription": {
+    "message": "If your transaction is not finalized within $1, it will be canceled and you will not be charged for gas.",
+    "description": "$1 is remaining time in seconds"
+  },
+  "smartTransactions": {
+    "message": "Smart Transactions"
+  },
+  "smartTransactionsBenefit1": {
+    "message": "99.5% success rate"
+  },
+  "smartTransactionsBenefit2": {
+    "message": "Transaction protection"
+  },
+  "smartTransactionsBenefit3": {
+    "message": "Real-time updates"
+  },
+  "smartTransactionsDescription": {
+    "message": "Unlock higher success rates, frontrunning protection, and better visibility with Smart Transactions."
+  },
+  "smartTransactionsDescription2": {
+    "message": "Only available on Ethereum. Enable or disable any time in settings. $1",
+    "description": "$1 is an external link to learn more about Smart Transactions"
+  },
+  "smartTransactionsOptItModalTitle": {
+    "message": "Transactions just got smarter"
   },
   "snapAccountCreated": {
     "message": "Account created"
@@ -4433,12 +4618,9 @@
     "message": "Accounts controlled by third-party Snaps."
   },
   "snapConnectionWarning": {
-    "message": "$1 wants to connect to $2. Only continue if you trust this website.",
+    "message": "$1 wants to use $2",
     "description": "$2 is the snap and $1 is the dapp requesting connection to the snap."
   },
-  "snapConnections": {
-    "message": "Snap Connections"
-  },
   "snapContent": {
     "message": "This content is coming from $1",
     "description": "This is shown when a snap shows transaction insight information in the confirmation UI. $1 is a link to the snap's settings page with the link text being the name of the snap."
@@ -4447,7 +4629,7 @@
     "message": "Website"
   },
   "snapInstallRequest": {
-    "message": "Installing $1 gives it the following permissions. Only continue if you trust $1.",
+    "message": "Installing $1 gives it the following permissions.",
     "description": "$1 is the snap name."
   },
   "snapInstallSuccess": {
@@ -4509,8 +4691,8 @@
     "description": "Error title used when snap update fails."
   },
   "snapUpdateRequest": {
-    "message": "Updating $1 to $2 gives it the following permissions. Only continue if you trust $1.",
-    "description": "$1 is the snap name and $2 is the snap version."
+    "message": "Updating $1 gives it the following permissions.",
+    "description": "$1 is the Snap name."
   },
   "snapUpdateSuccess": {
     "message": "Update complete"
@@ -4705,6 +4887,14 @@
   "stake": {
     "message": "Stake"
   },
+  "startYourJourney": {
+    "message": "Start your journey with $1",
+    "description": "$1 is the token symbol"
+  },
+  "startYourJourneyDescription": {
+    "message": "Get started with web3 by adding some $1 to your wallet.",
+    "description": "$1 is the token symbol"
+  },
   "stateLogError": {
     "message": "Error in retrieving state logs."
   },
@@ -4717,6 +4907,9 @@
   "stateLogsDescription": {
     "message": "State logs contain your public account addresses and sent transactions."
   },
+  "states": {
+    "message": "States"
+  },
   "status": {
     "message": "Status"
   },
@@ -4760,18 +4953,6 @@
   "strong": {
     "message": "Strong"
   },
-  "stxBenefit1": {
-    "message": "Minimize transaction costs"
-  },
-  "stxBenefit2": {
-    "message": "Reduce transaction failures"
-  },
-  "stxBenefit3": {
-    "message": "Eliminate stuck transactions"
-  },
-  "stxBenefit4": {
-    "message": "Prevent front-running"
-  },
   "stxCancelled": {
     "message": "Swap would have failed"
   },
@@ -4781,6 +4962,10 @@
   "stxCancelledSubDescription": {
     "message": "Try your swap again. We’ll be here to protect you against similar risks next time."
   },
+  "stxEstimatedCompletion": {
+    "message": "Estimated completion in < $1",
+    "description": "$1 is remeaning time in minutes and seconds, e.g. 0:10"
+  },
   "stxFailure": {
     "message": "Swap failed"
   },
@@ -4788,6 +4973,9 @@
     "message": "Sudden market changes can cause failures. If the problem persists, please reach out to $1.",
     "description": "This message is shown to a user if their swap fails. The $1 will be replaced by support.metamask.io"
   },
+  "stxOptInDescription": {
+    "message": "Turn on Smart Transactions for more reliable and secure transactions on ETH Mainnet. $1"
+  },
   "stxPendingPrivatelySubmittingSwap": {
     "message": "Privately submitting your Swap..."
   },
@@ -5276,14 +5464,15 @@
   "switchToThisAccount": {
     "message": "Switch to this account"
   },
-  "switchedTo": {
-    "message": "You're now using"
+  "switchedNetworkToastDecline": {
+    "message": "Don't show again"
   },
-  "switcherTitle": {
-    "message": "Network switcher"
+  "switchedNetworkToastMessage": {
+    "message": "$1 is now active on $2",
+    "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switcherTourDescription": {
-    "message": "Click the icon to switch networks or add a new network"
+  "switchedTo": {
+    "message": "You're now using"
   },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Switching networks will cancel all pending confirmations"
@@ -5593,6 +5782,12 @@
   "tryAgain": {
     "message": "Try again"
   },
+  "turnOff": {
+    "message": "Turn off"
+  },
+  "turnOn": {
+    "message": "Turn on"
+  },
   "turnOnTokenDetection": {
     "message": "Turn on enhanced token detection"
   },
@@ -5738,6 +5933,9 @@
   "view": {
     "message": "View"
   },
+  "viewActivity": {
+    "message": "View activity"
+  },
   "viewAllDetails": {
     "message": "View all details"
   },
@@ -5761,7 +5959,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "View $1 at $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "View $1 on Etherscan",
@@ -5773,6 +5971,9 @@
   "viewOnOpensea": {
     "message": "View on Opensea"
   },
+  "viewTransaction": {
+    "message": "View  transaction"
+  },
   "viewinCustodianApp": {
     "message": "View in custodian app"
   },
@@ -5872,10 +6073,6 @@
   "whatsThis": {
     "message": "What's this?"
   },
-  "xOfY": {
-    "message": "$1 of $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 of $2 pending",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index fbff1412a9e7..98f0b3a45eb5 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -348,19 +348,10 @@
     "message": "Todos sus NFT de $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": "Permitir que esta extensión externa haga lo siguiente:"
-  },
   "allowSpendToken": {
     "message": "¿Dar permiso para acceder a su $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Permitir que este sitio haga lo siguiente:"
-  },
-  "allowThisSnapTo": {
-    "message": "Permitir que este snap haga:"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -743,26 +734,6 @@
     "message": "Conectar $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Conectarse a $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Conectarse a todas sus $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "cuentas",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Conectarse a $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 cuentas",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Conectarse con MetaMask"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "General"
   },
-  "globalTitle": {
-    "message": "Menú global"
-  },
-  "globalTourDescription": {
-    "message": "Vea su portafolio, sitios conectados, configuraciones y más"
-  },
   "goBack": {
     "message": "Volver"
   },
@@ -2707,7 +2672,8 @@
     "message": "Un proveedor de red malintencionado puede mentir sobre el estado de la cadena de bloques y registrar su actividad de red. Agregue solo redes personalizadas de confianza."
   },
   "onlyConnectTrust": {
-    "message": "Conéctese solo con sitios de confianza."
+    "message": "Conéctese solo con sitios de confianza.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Pase al modo de pantalla completa para conectar su Ledger.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Solicitud de permiso"
   },
-  "permissionRequestCapitalized": {
-    "message": "Solicitud de permiso"
-  },
   "permissionRequested": {
     "message": "Solicitado ahora"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "Permisos"
   },
-  "permissionsTitle": {
-    "message": "Permisos"
-  },
-  "permissionsTourDescription": {
-    "message": "Encuentre sus cuentas conectadas y administre los permisos aquí"
-  },
   "personalAddressDetected": {
     "message": "Se detectó una dirección personal. Ingrese la dirección de contrato del token."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Contratos inteligentes"
   },
-  "smartSwapsAreHere": {
-    "message": "¡Los intercambios inteligentes ya están aquí!"
-  },
-  "smartSwapsDescription": {
-    "message": "¡La función Intercambios de MetaMask ahora es mucho más inteligente! Habilitar Intercambios inteligentes permitirá que MetaMask optimice mediante programación su intercambio para ayudar a:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "No hay suficientes fondos para un intercambio inteligente."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Sitio web"
   },
-  "snapInstallRequest": {
-    "message": "La instalación de $1 otorga los siguientes permisos. Solo continúe si confía en $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Instalación completa"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Fuerte"
   },
-  "stxBenefit1": {
-    "message": "Minimizar los costos de transacción"
-  },
-  "stxBenefit2": {
-    "message": "Reducir las fallas en las transacciones"
-  },
-  "stxBenefit3": {
-    "message": "Eliminar las transacciones atascadas"
-  },
-  "stxBenefit4": {
-    "message": "Prevenir la inversión ventajista"
-  },
   "stxCancelled": {
     "message": "El intercambio habría fallado"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Ha cambiado a"
   },
-  "switcherTitle": {
-    "message": "Selector de red"
-  },
-  "switcherTourDescription": {
-    "message": "Haga clic en el icono para cambiar de red o agregar una nueva red"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Cambiar de red cancelará todas las confirmaciones pendientes"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 en $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 en Etherscan",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "¿Qué es esto?"
   },
-  "xOfY": {
-    "message": "$1 de $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 de $2 están pendientes",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 370c94563e9d..6b01eb14cf43 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -172,16 +172,10 @@
   "alerts": {
     "message": "Alertas"
   },
-  "allowExternalExtensionTo": {
-    "message": "Permitir que esta extensión externa haga lo siguiente:"
-  },
   "allowSpendToken": {
     "message": "¿Dar permiso para acceder a su $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Permitir que este sitio haga lo siguiente:"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -377,26 +371,6 @@
   "connectManually": {
     "message": "Conectarse manualmente al sitio actual"
   },
-  "connectTo": {
-    "message": "Conectarse a $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Conectarse a todas sus $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "cuentas",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Conectarse a $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 cuentas",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Conectarse con MetaMask"
   },
@@ -1487,7 +1461,8 @@
     "message": "Un proveedor de red malintencionado puede mentir sobre el estado de la cadena de bloques y registrar su actividad de red. Agregue solo redes personalizadas de confianza."
   },
   "onlyConnectTrust": {
-    "message": "Conéctese solo con sitios de confianza."
+    "message": "Conéctese solo con sitios de confianza.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Abra MetaMask en pantalla completa para conectar su Ledger a través de WebHID.",
@@ -2543,7 +2518,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 en $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 en Etherscan",
@@ -2618,10 +2593,6 @@
   "whatsThis": {
     "message": "¿Qué es esto?"
   },
-  "xOfY": {
-    "message": "$1 de $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 de $2 están pendientes",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 6a29f4110dca..075d4d823a26 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -348,19 +348,10 @@
     "message": "Tous vos NFT via $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": "Autoriser cette extension externe à :"
-  },
   "allowSpendToken": {
     "message": "Donner l’autorisation d’accéder à votre $1 ?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Autoriser ce site à :"
-  },
-  "allowThisSnapTo": {
-    "message": "Autoriser ce snap à :"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -743,26 +734,6 @@
     "message": "Connecter $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Connectez-vous à $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Connectez-vous à vos $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "comptes",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Connectez-vous à $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 comptes",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Connectez-vous avec MetaMask"
   },
@@ -1653,12 +1624,6 @@
   "genericExplorerView": {
     "message": "Afficher le compte sur $1"
   },
-  "globalTitle": {
-    "message": "Menu global"
-  },
-  "globalTourDescription": {
-    "message": "Voyez votre portfolio, vos sites connectés, vos paramètres, et bien plus encore"
-  },
   "goBack": {
     "message": "Retour"
   },
@@ -2710,7 +2675,8 @@
     "message": "Un fournisseur de réseau malveillant peut mentir quant à l’état de la blockchain et enregistrer votre activité réseau. N’ajoutez que des réseaux personnalisés auxquels vous faites confiance."
   },
   "onlyConnectTrust": {
-    "message": "Ne vous connectez qu’aux sites auxquels vous faites confiance."
+    "message": "Ne vous connectez qu’aux sites auxquels vous faites confiance.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Passez en plein écran pour connecter votre Ledger.",
@@ -2807,9 +2773,6 @@
   "permissionRequest": {
     "message": "Demande d’autorisation"
   },
-  "permissionRequestCapitalized": {
-    "message": "Demande d’autorisation"
-  },
   "permissionRequested": {
     "message": "Demandé maintenant"
   },
@@ -2891,12 +2854,6 @@
   "permissions": {
     "message": "Autorisations"
   },
-  "permissionsTitle": {
-    "message": "Autorisations"
-  },
-  "permissionsTourDescription": {
-    "message": "Trouvez vos comptes connectés et gérez les autorisations ici"
-  },
   "personalAddressDetected": {
     "message": "Votre adresse personnelle a été détectée. Veuillez saisir à la place l’adresse du contrat du jeton."
   },
@@ -3483,12 +3440,6 @@
   "smartContracts": {
     "message": "Contrats intelligents"
   },
-  "smartSwapsAreHere": {
-    "message": "Les contrats de swap intelligents sont enfin arrivés !"
-  },
-  "smartSwapsDescription": {
-    "message": "Les swaps sont devenus beaucoup plus intelligents sur MetaMask ! L’activation des contrats de swap intelligents permettra à MetaMask d’optimiser programmatiquement le processus contractuel pour vous aider à :"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Fonds insuffisants pour souscrire un contrat de swap intelligent."
   },
@@ -3506,10 +3457,6 @@
   "snapDetailWebsite": {
     "message": "Site web"
   },
-  "snapInstallRequest": {
-    "message": "L’installation de $1 lui donne les autorisations suivantes. Ne continuez que si vous faites confiance à $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Installation terminée"
   },
@@ -3768,18 +3715,6 @@
   "strong": {
     "message": "Robuste"
   },
-  "stxBenefit1": {
-    "message": "Minimise les frais de transaction"
-  },
-  "stxBenefit2": {
-    "message": "Réduit les échecs de transaction"
-  },
-  "stxBenefit3": {
-    "message": "Élimine les blocages de transaction"
-  },
-  "stxBenefit4": {
-    "message": "Empêcher le favoritisme"
-  },
   "stxCancelled": {
     "message": "Le swap aurait échoué"
   },
@@ -4269,12 +4204,6 @@
   "switchedTo": {
     "message": "Vous êtes passé à"
   },
-  "switcherTitle": {
-    "message": "Commutateur réseau"
-  },
-  "switcherTourDescription": {
-    "message": "Cliquez sur l’icône pour changer de réseau ou ajouter un nouveau réseau"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Le changement de réseau annulera toutes les confirmations en attente"
   },
@@ -4710,7 +4639,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Afficher $1 à $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Afficher $1 sur Etherscan",
@@ -4814,10 +4743,6 @@
   "whatsThis": {
     "message": "Qu’est-ce que c’est ?"
   },
-  "xOfY": {
-    "message": "$1 sur $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 sur $2 en attente",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 7d1c50d48515..e263a2cafec9 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -348,19 +348,10 @@
     "message": "आपके सभी NFTs $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": "इस बाहरी एक्सटेंशन को इसकी अनुमति दें:"
-  },
   "allowSpendToken": {
     "message": "आपके $1 को एक्सेस करने की अनुमति दें?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "इस साइट को इसकी अनुमति दें:"
-  },
-  "allowThisSnapTo": {
-    "message": "इस Snap को इसकी अनुमति दें:"
-  },
   "allowWithdrawAndSpend": {
     "message": "$1 को निम्नलिखित तक अमाउंट निकालने और खर्च करने की अनुमति दें:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "$1 को कनेक्ट करें",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "$1 से कनेक्ट करें",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "अपने सभी $1 से कनेक्ट करें",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "एकाउंट्स",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "$1 से कनेक्ट करें",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 एकाउंट्स",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "MetaMask के साथ कनेक्ट करें"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "सामान्य"
   },
-  "globalTitle": {
-    "message": "वैश्विक मेन्यू"
-  },
-  "globalTourDescription": {
-    "message": "अपना पोर्टफ़ोलियो, जुड़ी हुई साइटें, सेटिंग्स आदि देखें"
-  },
   "goBack": {
     "message": "वापस जाएं"
   },
@@ -2707,7 +2672,8 @@
     "message": "एक बुरी नीयत वाला नेटवर्क प्रोवाइडर ब्लॉकचेन की स्थिति के बारे में झूठ बोल सकता है और आपकी नेटवर्क एक्टिविटी को रिकॉर्ड कर सकता है। केवल उन कस्टम नेटवर्क को जोड़ें, जिन पर आप भरोसा करते हैं।"
   },
   "onlyConnectTrust": {
-    "message": "केवल उन साइटों से कनेक्ट करें, जिन पर आप भरोसा करते हैं।"
+    "message": "केवल उन साइटों से कनेक्ट करें, जिन पर आप भरोसा करते हैं।",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "अपने Ledger को कनेक्ट करने के लिए फुल स्क्रीन पर जाएं।",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "अनुमति अनुरोध"
   },
-  "permissionRequestCapitalized": {
-    "message": "अनुमति के लिए अनुरोध"
-  },
   "permissionRequested": {
     "message": "अब रिक्वेस्ट किया गया"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "अनुमतियाँ"
   },
-  "permissionsTitle": {
-    "message": "अनुमतियां"
-  },
-  "permissionsTourDescription": {
-    "message": "अपने जुड़े हुए अकाउंट ढूंढें और अनुमतियां यहां प्रबंधित करें"
-  },
   "personalAddressDetected": {
     "message": "व्यक्तिगत एड्रेस का एड्रेस चला। टोकन कॉन्ट्रैक्ट एड्रेस डालें।"
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "स्मार्ट कॉन्ट्रैक्ट्स"
   },
-  "smartSwapsAreHere": {
-    "message": "स्मार्ट स्वैप यहां हैं!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask के स्वैप अब और अधिक स्मार्ट हो गए हैं! इन हेतु सहायता के लिए स्मार्ट स्वैप को इनेबल करने से MetaMask आपके स्वैप को प्रोग्रामेटिक रूप से ऑप्टिमाइज कर पाएगा:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "स्मार्ट स्वैप के लिए पर्याप्त फंड नहीं है।"
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "वेबसाइट"
   },
-  "snapInstallRequest": {
-    "message": "$1 इंस्टॉल करने से इसे निम्नलिखित अनुमतियां मिलती हैं। अगर आप $1 पर भरोसा करते हैं तो ही जारी रखें।",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "इंस्टॉलेशन समाप्त"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "मजबूत"
   },
-  "stxBenefit1": {
-    "message": "ट्रांसेक्शन लागतें मिनिमाइज़ करें"
-  },
-  "stxBenefit2": {
-    "message": "ट्रांसेक्शन विफलताएं कम करें"
-  },
-  "stxBenefit3": {
-    "message": "अटके हुए ट्रांसेक्शन को हटा दें"
-  },
-  "stxBenefit4": {
-    "message": "फ़्रंट-रनिंग को रोकें"
-  },
   "stxCancelled": {
     "message": "स्वैप विफल हो सकता था"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "आपने स्विच कर लिया है"
   },
-  "switcherTitle": {
-    "message": "नेटवर्क स्विचर"
-  },
-  "switcherTourDescription": {
-    "message": "नेटवर्क स्विच करने या नया नेटवर्क जोड़ने के लिए आइकन पर क्लिक करें"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "नेटवर्क स्विच करने से सभी लंबित कन्फर्मेशन कैंसिल हो जाएंगे"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$1 को $2 पर देखें",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Etherscan पर $1 देखें",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "यह क्या है?"
   },
-  "xOfY": {
-    "message": "$2 में से $1",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$2 में से $1 लंबित",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 52017a426059..fbaa937695e0 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -348,19 +348,10 @@
     "message": "Seluruh NFT Anda dari $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": "Izinkan ekstensi eksternal ini untuk:"
-  },
   "allowSpendToken": {
     "message": "Berikan izin untuk mengakses $1 Anda?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Izinkan situs ini untuk:"
-  },
-  "allowThisSnapTo": {
-    "message": "Izinkan snap ini untuk:"
-  },
   "allowWithdrawAndSpend": {
     "message": "Izinkan $1 untuk menarik dan menggunakan hingga jumlah berikut:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "Hubungkan $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Hubungkan ke $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Hubungkan ke semua $1 Anda",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "akun",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Hubungkan ke $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 akun",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Hubungkan dengan MetaMask"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Umum"
   },
-  "globalTitle": {
-    "message": "Menu global"
-  },
-  "globalTourDescription": {
-    "message": "Lihat portofolio, situs terhubung, pengaturan, dan lainnya"
-  },
   "goBack": {
     "message": "Kembali"
   },
@@ -2707,7 +2672,8 @@
     "message": "Penyedia jaringan jahat dapat berbohong tentang status blockchain dan merekam aktivitas jaringan Anda. Hanya tambahkan jaringan kustom yang Anda percayai."
   },
   "onlyConnectTrust": {
-    "message": "Hanya hubungkan ke situs yang Anda percayai."
+    "message": "Hanya hubungkan ke situs yang Anda percayai.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Buka layar penuh untuk menghubungkan Ledger Anda.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Permintaan izin"
   },
-  "permissionRequestCapitalized": {
-    "message": "Permintaan izin"
-  },
   "permissionRequested": {
     "message": "Diminta sekarang"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "Izin"
   },
-  "permissionsTitle": {
-    "message": "Izin"
-  },
-  "permissionsTourDescription": {
-    "message": "Temukan akun yang terhubung dan kelola izin di sini"
-  },
   "personalAddressDetected": {
     "message": "Alamat pribadi terdeteksi. Masukkan alamat kontrak token."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Kontrak cerdas"
   },
-  "smartSwapsAreHere": {
-    "message": "Smart Swap telah hadir!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps kini semakin pintar! Mengaktifkan Smart Swap akan mengizinkan MetaMask mengoptimalkan Swap secara terprogram untuk membantu:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Dana tidak cukup untuk pertukaran cerdas."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Situs web"
   },
-  "snapInstallRequest": {
-    "message": "Menginstal $1 memberinya izin berikut. Lanjutkan hanya jika Anda memercayai $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Instalasi selesai"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Kuat"
   },
-  "stxBenefit1": {
-    "message": "Meminimalkan biaya transaksi"
-  },
-  "stxBenefit2": {
-    "message": "Kurangi potensi kegagalan transaksi \t"
-  },
-  "stxBenefit3": {
-    "message": "Hapus transaksi yang macet"
-  },
-  "stxBenefit4": {
-    "message": "Cegah perilaku front running \t"
-  },
   "stxCancelled": {
     "message": "Pertukaran akan gagal"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Anda telah beralih ke"
   },
-  "switcherTitle": {
-    "message": "Pengalih jaringan"
-  },
-  "switcherTourDescription": {
-    "message": "Klik ikon untuk beralih jaringan atau menambahkan jaringan baru"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Mengalihkan jaringan akan membatalkan semua konfirmasi yang berstatus menunggu"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Lihat $1 di $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Lihat $1 di Etherscan",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "Apa ini?"
   },
-  "xOfY": {
-    "message": "$1 dari $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 dari $2 berstatus menunggu",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index e56fbdab8df1..668d3d34fdc4 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -241,16 +241,10 @@
     "message": "Tutti i tuoi $1",
     "description": "$1 is the symbol or name of the token that the user is approving spending"
   },
-  "allowExternalExtensionTo": {
-    "message": "Permetti a questa estensione di:"
-  },
   "allowSpendToken": {
     "message": "Dai il permesso di spendere tuoi $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Permetti a questo sito di:"
-  },
   "allowWithdrawAndSpend": {
     "message": "Consenti a $1 di ritirare e spendere fino a questo importo:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -456,26 +450,6 @@
   "connectManually": {
     "message": "Connettiti al sito manualmente"
   },
-  "connectTo": {
-    "message": "Connettiti a $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Connettiti a tutti i tuoi $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "account",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Connettiti a $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 account",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Connetti con MetaMask"
   },
@@ -1195,7 +1169,8 @@
     "message": "Una rete malevola può mentire sullo stato della blockchain e registrare le tue azioni. Aggiungi solo reti fidate."
   },
   "onlyConnectTrust": {
-    "message": "Connettiti solo con siti di cui ti fidi."
+    "message": "Connettiti solo con siti di cui ti fidi.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "origin": {
     "message": "Origine"
@@ -1825,10 +1800,6 @@
   "whatsThis": {
     "message": "Cos'è?"
   },
-  "xOfY": {
-    "message": "$1 di $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "youNeedToAllowCameraAccess": {
     "message": "Devi consentire l'accesso alla fotocamera per usare questa funzionalità."
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 2c096d1b1b52..a6159449e7fc 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -348,19 +348,10 @@
     "message": "$1のすべてのNFT",
     "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": "この外部拡張機能に次の操作を許可します"
-  },
   "allowSpendToken": {
     "message": "$1へのアクセス許可を与えますか？",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "このサイトに次の操作を許可します"
-  },
-  "allowThisSnapTo": {
-    "message": "このsnapに次の操作を許可します:"
-  },
   "allowWithdrawAndSpend": {
     "message": "$1に以下の額までの引き出しと使用を許可します。",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "$1を接続",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "$1に接続",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "すべての$1に接続",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "アカウント",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "$1に接続",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1アカウント",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "MetaMaskを使用して接続"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "一般"
   },
-  "globalTitle": {
-    "message": "グローバルメニュー"
-  },
-  "globalTourDescription": {
-    "message": "ポートフォリオ、接続されたサイト、設定などを確認できます"
-  },
   "goBack": {
     "message": "戻る"
   },
@@ -2707,7 +2672,8 @@
     "message": "悪意のあるネットワーク プロバイダーは、ブロックチェーンのステートを偽り、ユーザーのネットワークアクティビティを記録することがあります。信頼するカスタムネットワークのみを追加してください。"
   },
   "onlyConnectTrust": {
-    "message": "信頼するサイトにのみ接続してください。"
+    "message": "信頼するサイトにのみ接続してください。",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "全画面モードにしてLedgerを接続します。",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "許可のリクエスト"
   },
-  "permissionRequestCapitalized": {
-    "message": "許可のリクエスト"
-  },
   "permissionRequested": {
     "message": "現在リクエスト中"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "許可"
   },
-  "permissionsTitle": {
-    "message": "許可"
-  },
-  "permissionsTourDescription": {
-    "message": "ここで接続されたアカウントを見つけて許可の管理を行います"
-  },
   "personalAddressDetected": {
     "message": "個人アドレスが検出されました。トークンコントラクトアドレスを入力してください。"
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "スマートコントラクト"
   },
-  "smartSwapsAreHere": {
-    "message": "スマートスワップの登場です！"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swapsがはるかに賢くなりました！スマートスワップを有効にすると、MetaMaskがプログラムに従ってスワップを最適化できるようになるため、以下のようなメリットがあります。"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "スマートスワップに必要な資金が不足しています。"
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Webサイト"
   },
-  "snapInstallRequest": {
-    "message": "$1をインストールすることで、次のアクセス許可が付与されます。$1を信頼できる場合にのみ続行してください。",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "インストール完了"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "強"
   },
-  "stxBenefit1": {
-    "message": "トランザクションコストを最小化"
-  },
-  "stxBenefit2": {
-    "message": "トランザクションの失敗数を低減"
-  },
-  "stxBenefit3": {
-    "message": "トランザクションの停滞を解消"
-  },
-  "stxBenefit4": {
-    "message": "フロントランニングを防止"
-  },
   "stxCancelled": {
     "message": "スワップが失敗するところでした"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "次に切り替えました:"
   },
-  "switcherTitle": {
-    "message": "ネットワークスイッチャー"
-  },
-  "switcherTourDescription": {
-    "message": "アイコンをクリックしてネットワークを切り替えるか、新しいネットワークを追加します"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "ネットワークを切り替えると、保留中の承認がすべてキャンセルされます"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$1を$2で表示",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "$1をEtherscanで表示",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "これは何ですか？"
   },
-  "xOfY": {
-    "message": "$2中の$1",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$2件中$1件が保留中",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index ad6702b20e57..c547cb7354a3 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -348,19 +348,10 @@
     "message": "$1의 모든 내 NFT",
     "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": "이 외부 확장을 다음에 허용:"
-  },
   "allowSpendToken": {
     "message": "$1에 액세스할 수 있는 권한을 부여하시겠습니까?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "다음에 이 사이트를 허용:"
-  },
-  "allowThisSnapTo": {
-    "message": "다음에 이 스냅을 허용:"
-  },
   "allowWithdrawAndSpend": {
     "message": "$1에서 다음 금액까지 인출 및 지출하도록 허용:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "$1 연결",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "$1에 연결",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "모든 $1에 연결",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "계정",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "$1에 연결",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1개 계정",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "MetaMask로 연결"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "일반"
   },
-  "globalTitle": {
-    "message": "글로벌 메뉴"
-  },
-  "globalTourDescription": {
-    "message": "포트폴리오, 연결된 사이트, 설정 등을 확인하세요"
-  },
   "goBack": {
     "message": "뒤로 가기"
   },
@@ -2707,7 +2672,8 @@
     "message": "악성 네트워크 공급업체는 블록체인 상태를 거짓으로 보고하고 네트워크 활동을 기록할 수 있습니다. 신뢰하는 맞춤 네트워크만 추가하세요."
   },
   "onlyConnectTrust": {
-    "message": "신뢰하는 사이트만 연결하세요."
+    "message": "신뢰하는 사이트만 연결하세요.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "전체 화면으로 이동하여 Ledger를 연결하세요.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "권한 요청"
   },
-  "permissionRequestCapitalized": {
-    "message": "권한 요청"
-  },
   "permissionRequested": {
     "message": "지금 요청됨"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "권한"
   },
-  "permissionsTitle": {
-    "message": "권한"
-  },
-  "permissionsTourDescription": {
-    "message": "연결된 계정을 찾아 여기서 권한을 관리하세요"
-  },
   "personalAddressDetected": {
     "message": "개인 주소가 발견되었습니다. 토큰 계약 주소를 입력하세요."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "스마트 계약"
   },
-  "smartSwapsAreHere": {
-    "message": "스마트 스왑이 시작되었습니다!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask 스왑이 더욱 스마트해졌습니다! 스마트 스왑을 활성화하면 MetaMask가 프로그램을 통해 스왑을 최적화하여 다음과 같은 활동에 도움을 드립니다."
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "스마트 스왑 자금 부족"
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "웹사이트"
   },
-  "snapInstallRequest": {
-    "message": "$1 설치는 다음과 같은 권한을 허용합니다. $1 스냅을 신뢰하는 경우에만 계속 진행하세요.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "설치 완료"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "강함"
   },
-  "stxBenefit1": {
-    "message": "트랜잭션 비용 최소화하기"
-  },
-  "stxBenefit2": {
-    "message": "트랜잭션 실패 줄이기"
-  },
-  "stxBenefit3": {
-    "message": "중단된 트랜잭션 제거하기"
-  },
-  "stxBenefit4": {
-    "message": "프런트 러닝 방지"
-  },
   "stxCancelled": {
     "message": "스왑이 실패했을 것입니다"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "다음으로 변경했습니다:"
   },
-  "switcherTitle": {
-    "message": "네트워크 전환기"
-  },
-  "switcherTourDescription": {
-    "message": "아이콘을 클릭하면 네트워크가 변경되거나 새로운 네트워크가 추가됩니다"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "네트워크를 전환하면 대기 중인 모든 컨펌 작업이 취소됩니다."
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$2에서 $1 보기",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Etherscan에서 $1 보기",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "이것은 무엇인가요?"
   },
-  "xOfY": {
-    "message": "$1/$2개",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1/$2개 보류 중",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 9f33919237fa..ba8979bc4a95 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -96,12 +96,6 @@
   "alerts": {
     "message": "Mga Alerto"
   },
-  "allowExternalExtensionTo": {
-    "message": "Payagan ang external extension na ito na:"
-  },
-  "allowThisSiteTo": {
-    "message": "Payagan ang site na ito na:"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -249,26 +243,6 @@
   "connectManually": {
     "message": "Manu-manong kumonekta sa kasalukuyang site"
   },
-  "connectTo": {
-    "message": "Kumonekta sa $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Ikonekta sa lahat ng iyong $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "mga account",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Kumonekta sa $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "Mga $1 account",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Kumonekta sa MetaMask"
   },
@@ -960,7 +934,8 @@
     "message": "Magagawa ng nakakapinsalang network provider na magsinungaling tungkol sa status ng blockchain at itala ang aktibidad ng iyong network. Magdagdag lang ng mga custom na network na pinagkakatiwalaan mo."
   },
   "onlyConnectTrust": {
-    "message": "Kumonekta lang sa mga site na pinagkakatiwalaan mo."
+    "message": "Kumonekta lang sa mga site na pinagkakatiwalaan mo.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "origin": {
     "message": "Pinagmulan"
@@ -1774,10 +1749,6 @@
   "whatsThis": {
     "message": "Ano ito?"
   },
-  "xOfY": {
-    "message": "$1 ng $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 sa $2 ang nakabinbin",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index adfdccf4280b..7f8f53cf83ac 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -348,19 +348,10 @@
     "message": "Todos os seus NFTs de $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": "Permitir que essa extensão externa:"
-  },
   "allowSpendToken": {
     "message": "Você dá permissão para acessar seus $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Permitir que esse site:"
-  },
-  "allowThisSnapTo": {
-    "message": "Permitir que esse snap:"
-  },
   "allowWithdrawAndSpend": {
     "message": "Permitir que $1 saque e gaste até o seguinte valor:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "Conectar $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Conectar a $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Conecte-se a todas as suas $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "contas",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Conecte-se a $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 contas",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Conectar-se com a MetaMask"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Geral"
   },
-  "globalTitle": {
-    "message": "Menu global"
-  },
-  "globalTourDescription": {
-    "message": "Veja seu portfólio, sites conectados, configurações e mais"
-  },
   "goBack": {
     "message": "Voltar"
   },
@@ -2707,7 +2672,8 @@
     "message": "Um provedor de rede mal-intencionado pode mentir sobre o estado da blockchain e registrar as atividades da sua rede. Adicione somente as redes personalizadas em que você confia."
   },
   "onlyConnectTrust": {
-    "message": "Conecte-se somente com sites em que você confia."
+    "message": "Conecte-se somente com sites em que você confia.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Abra o app em tela cheia para conectar seu Ledger.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Solicitação de permissão"
   },
-  "permissionRequestCapitalized": {
-    "message": "Solicitação de permissão"
-  },
   "permissionRequested": {
     "message": "Solicitada agora"
   },
@@ -2892,12 +2855,6 @@
   "permissions": {
     "message": "Permissões"
   },
-  "permissionsTitle": {
-    "message": "Permissões"
-  },
-  "permissionsTourDescription": {
-    "message": "Encontre suas contas conectadas e gerencie permissões aqui"
-  },
   "personalAddressDetected": {
     "message": "Endereço pessoal detectado. Insira o endereço de contrato do token."
   },
@@ -3484,12 +3441,6 @@
   "smartContracts": {
     "message": "Contratos inteligentes"
   },
-  "smartSwapsAreHere": {
-    "message": "As trocas inteligentes chegaram!"
-  },
-  "smartSwapsDescription": {
-    "message": "As trocas na MetaMask ficaram muito mais inteligentes! Ativar as trocas inteligentes permitirá que a MetaMask otimize programaticamente sua troca para ajudar:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Fundos insuficientes para uma troca inteligente."
   },
@@ -3507,10 +3458,6 @@
   "snapDetailWebsite": {
     "message": "Site"
   },
-  "snapInstallRequest": {
-    "message": "Instalar $1 concede as permissões a seguir. Continue apenas se você confia em $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Instalação concluída"
   },
@@ -3769,18 +3716,6 @@
   "strong": {
     "message": "Forte"
   },
-  "stxBenefit1": {
-    "message": "Minimize os custos das transações"
-  },
-  "stxBenefit2": {
-    "message": "Reduza as falhas nas transações"
-  },
-  "stxBenefit3": {
-    "message": "Elimine transações travadas"
-  },
-  "stxBenefit4": {
-    "message": "Previna o front-running (uso de informações privilegiadas para negociações)"
-  },
   "stxCancelled": {
     "message": "A troca teria falhado"
   },
@@ -4270,12 +4205,6 @@
   "switchedTo": {
     "message": "Você alternou para"
   },
-  "switcherTitle": {
-    "message": "Alternador de redes"
-  },
-  "switcherTourDescription": {
-    "message": "Clique no ícone para alternar as redes ou adicionar uma nova"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "A alternância de redes cancelará todas as confirmações pendentes"
   },
@@ -4711,7 +4640,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 em $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 no Etherscan",
@@ -4815,10 +4744,6 @@
   "whatsThis": {
     "message": "O que é isso?"
   },
-  "xOfY": {
-    "message": "$1 de $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 de $2 pendente(s)",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index c2fe68724a82..b837d881daf3 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -172,16 +172,10 @@
   "alerts": {
     "message": "Alertas"
   },
-  "allowExternalExtensionTo": {
-    "message": "Permitir que essa extensão externa:"
-  },
   "allowSpendToken": {
     "message": "Você concede acesso aos seus $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Permitir que esse site:"
-  },
   "allowWithdrawAndSpend": {
     "message": "Permitir que $1 saque e gaste até o seguinte valor:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -377,26 +371,6 @@
   "connectManually": {
     "message": "Conectar manualmente ao site atual"
   },
-  "connectTo": {
-    "message": "Conectar a $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Conecte-se a todas as suas $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "contas",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Conecte-se a $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 contas",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Conectar-se com a MetaMask"
   },
@@ -1491,7 +1465,8 @@
     "message": "Um provedor de rede mal-intencionado pode mentir sobre o estado do blockchain e registrar as atividades da sua rede. Adicione somente as redes personalizadas em que você confia."
   },
   "onlyConnectTrust": {
-    "message": "Conecte-se somente com sites em que você confia."
+    "message": "Conecte-se somente com sites em que você confia.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Abra a MetaMask em tela cheia para conectar sua ledger por meio do WebHID.",
@@ -2547,7 +2522,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Ver $1 em $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Ver $1 no Etherscan",
@@ -2622,10 +2597,6 @@
   "whatsThis": {
     "message": "O que é isso?"
   },
-  "xOfY": {
-    "message": "$1 de $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 de $2 pendente",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index bd3b27f8beae..e200ec9a99f1 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -348,19 +348,10 @@
     "message": "Все ваши NFT из $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": "Разрешить этому внешнему расширению:"
-  },
   "allowSpendToken": {
     "message": "Разрешить доступ к вашему $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Разрешить этому сайту:"
-  },
-  "allowThisSnapTo": {
-    "message": "Разрешить этот snap к:"
-  },
   "allowWithdrawAndSpend": {
     "message": "Разрешить $1 снять и потратить до следующей суммы:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "Подключиться к $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Подключиться к $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Подключиться ко всем вашим $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "счетам",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Подключиться к $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 счетам",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Подключиться с помощью MetaMask"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Общие"
   },
-  "globalTitle": {
-    "message": "Глобальное меню"
-  },
-  "globalTourDescription": {
-    "message": "Просматривайте свой Portfolio, подключенные сайты, настройки и многое другое"
-  },
   "goBack": {
     "message": "Назад"
   },
@@ -2707,7 +2672,8 @@
     "message": "Вредоносный сетевой провайдер может дезинформировать о состоянии блокчейна и записывать ваши действия в сети. Добавляйте только те пользовательские сети, которым доверяете."
   },
   "onlyConnectTrust": {
-    "message": "Подключайтесь только к сайтам, которым доверяете."
+    "message": "Подключайтесь только к сайтам, которым доверяете.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Перейдите в полноэкранный режим, чтобы подключить свой Ledger.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Запрос разрешения"
   },
-  "permissionRequestCapitalized": {
-    "message": "Запрос разрешения"
-  },
   "permissionRequested": {
     "message": "Запрошено сейчас"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "Разрешения"
   },
-  "permissionsTitle": {
-    "message": "Разрешения"
-  },
-  "permissionsTourDescription": {
-    "message": "Найдите свои подключенные счета и управляйте разрешениями здесь"
-  },
   "personalAddressDetected": {
     "message": "Обнаружен личный адрес. Введите адрес контракта токена."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Смарт-контракты"
   },
-  "smartSwapsAreHere": {
-    "message": "Появились смарт-свопы!"
-  },
-  "smartSwapsDescription": {
-    "message": "Свопы MetaMask стали намного умнее! Включение смарт-свопов позволит MetaMask программно оптимизировать ваш своп, чтобы помочь:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Недостаточно средств для смарт-свопа."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Веб-сайт"
   },
-  "snapInstallRequest": {
-    "message": "Установка $1 дает ему следующие разрешения. Продолжайте, только если доверяете $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Установка завершена"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Сильный"
   },
-  "stxBenefit1": {
-    "message": "Минимизируйте транзакционные издержки"
-  },
-  "stxBenefit2": {
-    "message": "Уменьшите количество сбоев транзакций"
-  },
-  "stxBenefit3": {
-    "message": "Устраните зависание транзакций"
-  },
-  "stxBenefit4": {
-    "message": "Предотвратите опережение"
-  },
   "stxCancelled": {
     "message": "Своп бы не удался"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Вы переключились на"
   },
-  "switcherTitle": {
-    "message": "Переключатель сети"
-  },
-  "switcherTourDescription": {
-    "message": "Нажмите на значок для переключения сетей или добавления новой сети"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "В случае смены сетей все ожидающие подтверждения будут отменены"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Смотреть $1 в $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Смотреть 1$ на Etherscan",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "Что это?"
   },
-  "xOfY": {
-    "message": "$1 из $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 из $2 ожидающих",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 115104b327dd..8e1fe644a228 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -348,19 +348,10 @@
     "message": "Lahat ng iyong NFT mula sa $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": "Payagan ang external extension na ito na:"
-  },
   "allowSpendToken": {
     "message": "Magbigay ng pahintulot na ma-access ang iyong $1?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Payagan ang site na ito na:"
-  },
-  "allowThisSnapTo": {
-    "message": "Payagan ang snap na ito sa:"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -743,26 +734,6 @@
     "message": "Ikonekta ang $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Kumonekta sa $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Ikonekta sa lahat ng iyong $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "mga account",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Kumonekta sa $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "Mga $1 account",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Kumonekta sa MetaMask"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Pangkalahatan"
   },
-  "globalTitle": {
-    "message": "Global menu"
-  },
-  "globalTourDescription": {
-    "message": "Tingnan ang iyong portfolio, mga nakakonektang site, setting at marami pang iba"
-  },
   "goBack": {
     "message": "Bumalik"
   },
@@ -2707,7 +2672,8 @@
     "message": "Ang isang mapaminsalang network provider ay maaaring magsinungaling tungkol sa estado ng blockchain at itala ang iyong aktibidad sa network. Magdagdag lamang ng mga custom na network na pinagkakatiwalaan mo."
   },
   "onlyConnectTrust": {
-    "message": "Kumonekta lang sa mga site na pinagkakatiwalaan mo."
+    "message": "Kumonekta lang sa mga site na pinagkakatiwalaan mo.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Pumunta sa full screen para ikonekta ang iyong Ledger.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Kahilingan sa pahintulot"
   },
-  "permissionRequestCapitalized": {
-    "message": "Kahilingan sa pahintulot"
-  },
   "permissionRequested": {
     "message": "Hiniling ngayon"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "Mga Pahintulot"
   },
-  "permissionsTitle": {
-    "message": "Mga Pahintulot"
-  },
-  "permissionsTourDescription": {
-    "message": "Hanapin ang mga nakakonekta mong account at pamahalaan ang mga pahintulot dito"
-  },
   "personalAddressDetected": {
     "message": "Natukoy ang personal na address. Ilagay ang address ng kontrata ng token."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Mga smart na kontrata"
   },
-  "smartSwapsAreHere": {
-    "message": "Nandito na ang mga Smart Swap!"
-  },
-  "smartSwapsDescription": {
-    "message": "Mas humusay pa ang mga MetaMask Swap! Ang pag-enable sa mga Smart Swap ay magbibigay-daan sa MetaMask na i-optimize ang iyong Swap gamit ang program para makatulong na:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Hindi sapat ang pondo para sa smart swap."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Website"
   },
-  "snapInstallRequest": {
-    "message": "Ang pag-install ng $1 ay nagbibigay dito ng mga sumusunod na pahintulot. Magpatuloy lang kung pinagkakatiwalaan mo ang $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Tapos na ang pag-install"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Mahirap"
   },
-  "stxBenefit1": {
-    "message": "Bawasan ang mga gastos sa transaksyon"
-  },
-  "stxBenefit2": {
-    "message": "Bawasan ang mga nabigong transaksyon"
-  },
-  "stxBenefit3": {
-    "message": "Alisin ang mga hindi umuusad na transaksyon"
-  },
-  "stxBenefit4": {
-    "message": "Pigilan ang front-running"
-  },
   "stxCancelled": {
     "message": "Nabigo sana ang pag-swap kung"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Lumipat ka sa"
   },
-  "switcherTitle": {
-    "message": "Network switcher"
-  },
-  "switcherTourDescription": {
-    "message": "I-click ang icon para lumipat ng network o magdagdag ng bagong network"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Ang paglipat ng network ay magkakansela ng lahat ng nakabinbing kumpirmasyon"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Tingnan ang $1 sa $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Tingnan ang $1 sa Etherscan",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "Ano ito?"
   },
-  "xOfY": {
-    "message": "$1 ng $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 ng $2 ang nakabinbin",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 0b268dcd5a9e..21fa9e79b8e1 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -348,19 +348,10 @@
     "message": "Tüm $1 NFT'leriniz",
     "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": "Bu harici uzantının şunu yapmasına izin ver:"
-  },
   "allowSpendToken": {
     "message": "$1 erişimine izin ver?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Bu sitenin şunu yapmasına izin ver:"
-  },
-  "allowThisSnapTo": {
-    "message": "Bu snap için şuna izin verin:"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -743,26 +734,6 @@
     "message": "Şuna bağlanın: $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "$1 uygulamasına bağlan",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Tümüne bağlan: $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "hesaplar",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Bağlan: $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 hesap",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "MetaMask ile Bağlan"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Genel"
   },
-  "globalTitle": {
-    "message": "Genel menü"
-  },
-  "globalTourDescription": {
-    "message": "Portföyünüze, bağlı sitelere, ayarlara ve daha fazlasına bakın"
-  },
   "goBack": {
     "message": "Geri git"
   },
@@ -2707,7 +2672,8 @@
     "message": "Kötü amaçlı bir ağ sağlayıcı blokzinciri durumu hakkında yalan söyleyebilir ve ağ aktivitenizi kaydedebilir. Sadece güvendiğiniz özel ağları ekleyin."
   },
   "onlyConnectTrust": {
-    "message": "Sadece güvendiğiniz sitelere bağlayın."
+    "message": "Sadece güvendiğiniz sitelere bağlayın.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Ledger'ınızı bağlamak için tam ekrana gidin.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "İzin talebi"
   },
-  "permissionRequestCapitalized": {
-    "message": "İzin talebi"
-  },
   "permissionRequested": {
     "message": "Şimdi talep edildi"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "İzinler"
   },
-  "permissionsTitle": {
-    "message": "İzinler"
-  },
-  "permissionsTourDescription": {
-    "message": "Burada bağlı hesaplarınızı bulun ve izinleri yönetin"
-  },
   "personalAddressDetected": {
     "message": "Kişisel adres algılandı. Token sözleşme adresini girin."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Akıllı sözleşmeler"
   },
-  "smartSwapsAreHere": {
-    "message": "Akıllı Swap'lar burada!"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swap işlemleri artık çok daha akıllı! Akıllı Swap'ları etkinleştirmek, MetaMask'in aşağıdakilere yardımcı olmak için Swap'ini programlı olarak optimize etmesine olanak tanır:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Akıllı swap için yeterli para yok."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Web Sitesi"
   },
-  "snapInstallRequest": {
-    "message": "$1 yüklendiğinde aşağıdaki izinler verilir. Sadece $1 adlı snape güveniyorsanız devam edin.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Yükleme tamamlandı"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Güçlü"
   },
-  "stxBenefit1": {
-    "message": "İşlem maliyetlerini en aza indir"
-  },
-  "stxBenefit2": {
-    "message": "İşlem hatalarını azalt"
-  },
-  "stxBenefit3": {
-    "message": "Sıkışmış işlemleri ortadan kaldır"
-  },
-  "stxBenefit4": {
-    "message": "Önden çalıştırmayı engelle"
-  },
   "stxCancelled": {
     "message": "Swap işlemi başarısız olurdu"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Şuna geçiş yaptınız:"
   },
-  "switcherTitle": {
-    "message": "Ağ değiştirici"
-  },
-  "switcherTourDescription": {
-    "message": "Ağ değiştirmek veya yeni bir ağ eklemek için simgeye tıklayın"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Ağ değiştirmek bekleyen tüm onayları iptal eder"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "$1 ögesini $2 üzerinde görüntüle",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Etherscan'de $1 görüntüle",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "Bu nedir?"
   },
-  "xOfY": {
-    "message": "$1 / $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 / $2 bekliyor",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 62a63f8e1ec7..b77ef6777e9a 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -348,19 +348,10 @@
     "message": "Tất cả NFT của bạn từ $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": "Cho phép tiện ích mở rộng bên ngoài này:"
-  },
   "allowSpendToken": {
     "message": "Cấp quyền truy cập vào $1 của bạn?",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "Cho phép trang web này:"
-  },
-  "allowThisSnapTo": {
-    "message": "Cho phép Snap này:"
-  },
   "allowWithdrawAndSpend": {
     "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'"
@@ -743,26 +734,6 @@
     "message": "Kết nối $1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "Kết nối với $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "Kết nối với tất cả các $1 của bạn",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "tài khoản",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "Kết nối với $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 tài khoản",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "Kết nối với MetaMask"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "Chung"
   },
-  "globalTitle": {
-    "message": "Trình đơn chung"
-  },
-  "globalTourDescription": {
-    "message": "Xem danh mục đầu tư, trang web đã kết nối, cài đặt, v.v... của bạn"
-  },
   "goBack": {
     "message": "Quay Lại"
   },
@@ -2707,7 +2672,8 @@
     "message": "Một nhà cung cấp mạng độc hại có thể nói dối về trạng thái của chuỗi khối và ghi lại hoạt động của bạn trên mạng. Chỉ thêm các mạng tùy chỉnh mà bạn tin tưởng."
   },
   "onlyConnectTrust": {
-    "message": "Chỉ kết nối với các trang web mà bạn tin tưởng."
+    "message": "Chỉ kết nối với các trang web mà bạn tin tưởng.",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "Bật toàn màn hình để kết nối với thiết bị Ledger của bạn.",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "Yêu cầu cấp quyền"
   },
-  "permissionRequestCapitalized": {
-    "message": "Yêu cầu cấp quyền"
-  },
   "permissionRequested": {
     "message": "Đã yêu cầu ngay"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "Quyền"
   },
-  "permissionsTitle": {
-    "message": "Quyền"
-  },
-  "permissionsTourDescription": {
-    "message": "Tìm tài khoản đã kết nối của bạn và quản lý quyền tại đây"
-  },
   "personalAddressDetected": {
     "message": "Đã tìm thấy địa chỉ cá nhân. Nhập địa chỉ hợp đồng token."
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "Hợp đồng thông minh"
   },
-  "smartSwapsAreHere": {
-    "message": "Hoán đổi thông minh đã ra mắt!"
-  },
-  "smartSwapsDescription": {
-    "message": "Tính năng Hoán đổi của MetaMask nay đã thông minh hơn rất nhiều! Kích hoạt Hoán đổi thông minh sẽ cho phép MetaMask tối ưu quy trình Hoán đổi để giúp bạn:"
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "Không có đủ tiền để thực hiện hoán đổi thông minh."
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "Trang web"
   },
-  "snapInstallRequest": {
-    "message": "Cài đặt $1 để được cấp các quyền sau. Chỉ tiếp tục nếu bạn tin tưởng $1.",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "Cài đặt hoàn tất"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "Mạnh"
   },
-  "stxBenefit1": {
-    "message": "Giảm thiểu chi phí giao dịch"
-  },
-  "stxBenefit2": {
-    "message": "Giảm tỷ lệ thất bại khi giao dịch"
-  },
-  "stxBenefit3": {
-    "message": "Loại bỏ các giao dịch bị mắc kẹt"
-  },
-  "stxBenefit4": {
-    "message": "Ngăn chặn giao dịch chạy trước"
-  },
   "stxCancelled": {
     "message": "Hoán đổi sẽ thất bại"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "Bạn đã chuyển sang"
   },
-  "switcherTitle": {
-    "message": "Trình chuyển mạng"
-  },
-  "switcherTourDescription": {
-    "message": "Nhấp vào biểu tượng để chuyển mạng hoặc thêm mạng mới"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Khi bạn chuyển mạng, mọi xác nhận đang chờ xử lý sẽ bị hủy"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "Xem $1 tại $2",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "Xem $1 trên Etherscan",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "Đây là gì?"
   },
-  "xOfY": {
-    "message": "$1/$2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1/$2 đang chờ xử lý",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 8e2a95ae4ecb..20d08a9cab47 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -348,19 +348,10 @@
     "message": "您所有在$1的NFT",
     "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": "允许此外部扩展程序："
-  },
   "allowSpendToken": {
     "message": "授予访问您的 $1 的权限？",
     "description": "$1 is the symbol of the token that are requesting to spend"
   },
-  "allowThisSiteTo": {
-    "message": "允许此网站："
-  },
-  "allowThisSnapTo": {
-    "message": "允许此 Snap："
-  },
   "allowWithdrawAndSpend": {
     "message": "允许 $1 提取和消费最高以下金额：",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -743,26 +734,6 @@
     "message": "连接$1",
     "description": "$1 is the snap for which a connection is being requested."
   },
-  "connectTo": {
-    "message": "连接到 $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "连接到您的全部 $1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "账户",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "连接到 $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 个账户",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "与 MetaMask 连接"
   },
@@ -1650,12 +1621,6 @@
   "general": {
     "message": "通用"
   },
-  "globalTitle": {
-    "message": "全局菜单"
-  },
-  "globalTourDescription": {
-    "message": "查看您的投资组合、已连接的网站、设置等等"
-  },
   "goBack": {
     "message": "返回"
   },
@@ -2707,7 +2672,8 @@
     "message": "恶意网络提供商可能会谎报区块链的状态并记录您的网络活动。只添加您信任的自定义网络。"
   },
   "onlyConnectTrust": {
-    "message": "只连接您信任的网站。"
+    "message": "只连接您信任的网站。",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "openFullScreenForLedgerWebHid": {
     "message": "全屏打开以连接您的 Ledger。",
@@ -2804,9 +2770,6 @@
   "permissionRequest": {
     "message": "权限请求"
   },
-  "permissionRequestCapitalized": {
-    "message": "权限请求"
-  },
   "permissionRequested": {
     "message": "立即请求"
   },
@@ -2888,12 +2851,6 @@
   "permissions": {
     "message": "权限"
   },
-  "permissionsTitle": {
-    "message": "权限"
-  },
-  "permissionsTourDescription": {
-    "message": "在此处查看您的已连接账户并管理权限"
-  },
   "personalAddressDetected": {
     "message": "检测到个人地址。请输入代币合约地址。"
   },
@@ -3480,12 +3437,6 @@
   "smartContracts": {
     "message": "智能合约"
   },
-  "smartSwapsAreHere": {
-    "message": "智能兑换已推出！"
-  },
-  "smartSwapsDescription": {
-    "message": "MetaMask Swaps 变得更加智能！启用智能兑换使得 MetaMask 在编程方面让您的兑换体验更加优化，有助于："
-  },
   "smartSwapsErrorNotEnoughFunds": {
     "message": "没有足够的资金进行智能兑换。"
   },
@@ -3503,10 +3454,6 @@
   "snapDetailWebsite": {
     "message": "网站"
   },
-  "snapInstallRequest": {
-    "message": "安装$1，将向其授予以下权限。只有在您信任$1的情况下才能继续。",
-    "description": "$1 is the snap name."
-  },
   "snapInstallSuccess": {
     "message": "安装完成"
   },
@@ -3765,18 +3712,6 @@
   "strong": {
     "message": "强"
   },
-  "stxBenefit1": {
-    "message": "将交易成本减至最低"
-  },
-  "stxBenefit2": {
-    "message": "减少交易失败"
-  },
-  "stxBenefit3": {
-    "message": "消除卡住的交易"
-  },
-  "stxBenefit4": {
-    "message": "防止抢先交易"
-  },
   "stxCancelled": {
     "message": "交换就会失败"
   },
@@ -4266,12 +4201,6 @@
   "switchedTo": {
     "message": "您已切换到"
   },
-  "switcherTitle": {
-    "message": "网络切换工具"
-  },
-  "switcherTourDescription": {
-    "message": "点击此图标以切换网络或添加新网络"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "切换网络将取消所有待处理的确认"
   },
@@ -4707,7 +4636,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "在 $2 上查看 $1",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "在 Etherscan 上查看 $1",
@@ -4811,10 +4740,6 @@
   "whatsThis": {
     "message": "这是什么？"
   },
-  "xOfY": {
-    "message": "$1 / $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 / $2 待处理",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index ce0fc3d38a96..d3d6207ae492 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -92,12 +92,6 @@
   "alerts": {
     "message": "提醒"
   },
-  "allowExternalExtensionTo": {
-    "message": "允許這個外部擴充功能："
-  },
-  "allowThisSiteTo": {
-    "message": "允許這個網站："
-  },
   "allowWithdrawAndSpend": {
     "message": "允許 $1 提款或最多花費以下額度：",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
@@ -245,26 +239,6 @@
   "connectManually": {
     "message": "手動連結到目前的網站"
   },
-  "connectTo": {
-    "message": "連結到 $1",
-    "description": "$1 is the name/origin of a web3 site/application that the user can connect to metamask"
-  },
-  "connectToAll": {
-    "message": "連結到您的全部$1",
-    "description": "$1 will be replaced by the translation of connectToAllAccounts"
-  },
-  "connectToAllAccounts": {
-    "message": "帳戶",
-    "description": "will replace $1 in connectToAll, completing the sentence 'connect to all of your accounts', will be text that shows list of accounts on hover"
-  },
-  "connectToMultiple": {
-    "message": "連結到 $1",
-    "description": "$1 will be replaced by the translation of connectToMultipleNumberOfAccounts"
-  },
-  "connectToMultipleNumberOfAccounts": {
-    "message": "$1 個帳戶",
-    "description": "$1 is the number of accounts to which the web3 site/application is asking to connect; this will substitute $1 in connectToMultiple"
-  },
   "connectWithMetaMask": {
     "message": "連結到 MetaMask"
   },
@@ -959,7 +933,8 @@
     "message": "惡意的網路提供者可以欺騙您區塊鏈上的狀態或記錄您的網路活動。請只新增您信任的自訂網路。"
   },
   "onlyConnectTrust": {
-    "message": "記住，只連線到您信任的網站。"
+    "message": "記住，只連線到您信任的網站。",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
   },
   "origin": {
     "message": "來源"
@@ -1483,7 +1458,7 @@
   },
   "viewOnCustomBlockExplorer": {
     "message": "在 $1 瀏覽",
-    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Explorer URL"
   },
   "viewOnEtherscan": {
     "message": "在 Etherscan 上瀏覽",
@@ -1509,10 +1484,6 @@
   "whatsThis": {
     "message": "這是什麼？"
   },
-  "xOfY": {
-    "message": "$1 之 $2",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total"
-  },
   "xOfYPending": {
     "message": "$1 之 $2 等待中",
     "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
diff --git a/app/background.html b/app/background.html
index 148842e8f868..c0068295d730 100644
--- a/app/background.html
+++ b/app/background.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
   </head>
   <body>
-    <script src="./load-background.js" type="text/javascript" charset="utf-8"></script>
-    <script src="./chromereload.js" type="text/javascript" charset="utf-8"></script>
+    <script src="./load-background.js"></script>
+    <script src="./chromereload.js"></script>
   </body>
 </html>
diff --git a/app/home.html b/app/home.html
index 3210c30475c9..b94800b13d78 100644
--- a/app/home.html
+++ b/app/home.html
@@ -8,7 +8,7 @@
     <% } else { %>
     <title>MetaMask</title>
     <% } %>
-    <link rel="stylesheet" type="text/css" href="./index.css">
+    <link rel="stylesheet" href="./index.css">
   </head>
   <body>
     <div id="app-content">
@@ -16,6 +16,6 @@
       <img class="loading-spinner" src="./images/spinner.gif" alt="" loading="lazy" />
     </div>
     <div id="popover-content"></div>
-    <script src="./load-app.js" type="text/javascript" charset="utf-8" async></script>
+    <script src="./load-app.js" async></script>
   </body>
 </html>
diff --git a/app/images/arbitrum.svg b/app/images/arbitrum.svg
index 8863afe882c8..9c19a48f2d72 100644
--- a/app/images/arbitrum.svg
+++ b/app/images/arbitrum.svg
@@ -1,12 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 373.1 420.29">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #1b4add;
-      }
-    </style>
-  </defs>
-  <path class="cls-1" d="m187.11,26.09c1.03,0,1.98.26,2.93.77l154.13,89.64c1.81,1.03,2.93,2.93,2.84,4.99l-.6,178.33c0,2.07-1.12,3.96-2.93,4.99l-154.65,88.6c-.86.52-1.89.77-2.93.77s-1.98-.26-2.93-.77L28.85,303.78c-1.81-1.03-2.93-2.93-2.84-4.99l.6-178.33c0-2.07,1.12-3.96,2.93-4.99L184.27,26.78c.86-.43,1.89-.69,2.84-.69m.09-26.09c-5.51,0-11.02,1.38-15.93,4.22L16.62,92.82C6.72,98.51.6,109.01.6,120.38l-.6,178.33c0,11.37,6.03,21.87,15.84,27.64l154.13,89.64c4.91,2.84,10.42,4.31,15.93,4.31s11.02-1.38,15.93-4.22l154.65-88.6c9.9-5.68,16.02-16.19,16.02-27.55l.6-178.33c0-11.37-6.03-21.87-15.84-27.64L203.13,4.31c-4.91-2.84-10.42-4.31-15.93-4.31h0Z"/>
-  <path class="cls-1" d="m218.45,97.21h-22.56c-1.72,0-3.19,1.03-3.79,2.67l-72.67,199.16c-.52,1.29.52,2.67,1.89,2.67h22.56c1.72,0,3.19-1.03,3.79-2.67l72.67-199.16c.52-1.29-.52-2.67-1.89-2.67Zm-39.52,0h-22.56c-1.72,0-3.19,1.03-3.79,2.67l-72.59,199.08c-.52,1.29.52,2.67,1.89,2.67h22.56c1.72,0,3.19-1.03,3.79-2.67l72.59-199.08c.52-1.29-.43-2.67-1.89-2.67Zm29.28,77.15c-.6-1.81-3.19-1.81-3.79,0l-11.71,32.2c-.34.86-.34,1.89,0,2.76l32.72,89.64c.6,1.55,2.07,2.67,3.79,2.67h22.56c1.38,0,2.41-1.38,1.89-2.67l-45.46-124.6Zm84.9,124.6l-65.18-178.76c-.6-1.81-3.19-1.81-3.79,0l-11.71,32.2c-.34.86-.34,1.89,0,2.76l52.44,143.8c.6,1.55,2.07,2.67,3.79,2.67h22.56c1.46.09,2.41-1.38,1.89-2.67Z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1080 1218.5" style="enable-background:new 0 0 1080 1218.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#213147;}
+	.st1{fill:#12AAFF;}
+	.st2{fill:#9DCCED;}
+	.st3{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M41,370.4v477.7c0,30.5,16.3,58.7,42.7,73.9l413.7,238.9c26.4,15.2,58.9,15.2,85.3,0L996.4,922
+		c26.4-15.2,42.7-43.4,42.7-73.9V370.4c0-30.5-16.3-58.7-42.7-73.9L582.7,57.6c-26.4-15.2-58.9-15.2-85.3,0L83.6,296.5
+		C57.2,311.7,41,339.9,41,370.4z"/>
+	<g>
+		<g>
+			<g>
+				<path class="st1" d="M630.3,701.9l-59,161.8c-1.6,4.5-1.6,9.4,0,13.9L672.8,1156l117.4-67.8L649.3,701.9
+					C646.1,693,633.5,693,630.3,701.9z"/>
+			</g>
+			<g>
+				<path class="st1" d="M748.6,429.8c-3.2-8.9-15.8-8.9-19,0l-59,161.8c-1.6,4.5-1.6,9.4,0,13.9l166.3,455.8l117.4-67.8
+					L748.6,429.8z"/>
+			</g>
+		</g>
+	</g>
+	<path class="st2" d="M540,75.5c2.9,0,5.8,0.8,8.4,2.2l447.7,258.5c5.2,3,8.4,8.6,8.4,14.5v516.9c0,6-3.2,11.5-8.4,14.5
+		l-447.7,258.5c-2.5,1.5-5.5,2.2-8.4,2.2c-2.9,0-5.8-0.8-8.4-2.2L83.9,882.3c-5.2-3-8.4-8.6-8.4-14.5V350.8c0-6,3.2-11.5,8.4-14.5
+		L531.6,77.8C534.2,76.3,537.1,75.5,540,75.5 M540,0c-15.9,0-31.9,4.1-46.2,12.4L46.2,270.8c-28.6,16.5-46.2,47-46.2,80v516.9
+		c0,33,17.6,63.5,46.2,80l447.7,258.5c14.3,8.2,30.2,12.4,46.2,12.4c15.9,0,31.9-4.1,46.2-12.4l447.7-258.5
+		c28.6-16.5,46.2-47,46.2-80V350.8c0-33-17.6-63.5-46.2-80L586.2,12.4C571.9,4.1,555.9,0,540,0L540,0z"/>
+	<polygon class="st0" points="243.9,1061.9 285.1,949.1 368,1018 290.5,1088.8 	"/>
+	<g>
+		<path class="st3" d="M502.3,313.8H388.8c-8.5,0-16.1,5.3-19,13.3l-243.3,667l117.4,67.8l267.9-734.5
+			C514.3,320.8,509.4,313.8,502.3,313.8z"/>
+		<path class="st3" d="M700.9,313.8H587.4c-8.5,0-16.1,5.3-19,13.3l-277.8,761.6l117.4,67.8l302.4-829.1
+			C712.8,320.8,707.9,313.8,700.9,313.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/app/images/filecoin.svg b/app/images/filecoin.svg
new file mode 100644
index 000000000000..0dacb5b294ad
--- /dev/null
+++ b/app/images/filecoin.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1080" height="1080" viewBox="0 0 1080 1080" xml:space="preserve">
+<desc>Created with Fabric.js 5.2.4</desc>
+<defs>
+</defs>
+<g transform="matrix(1 0 0 1 540 540)" id="33ec6045-f7e3-4c6b-900c-12953fc82693"  >
+<rect style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(255,255,255); fill-rule: nonzero; opacity: 1; visibility: hidden;" vector-effect="non-scaling-stroke"  x="-540" y="-540" rx="0" ry="0" width="1080" height="1080" />
+</g>
+<g transform="matrix(1 0 0 1 540 540)" id="59500206-5266-4427-96c8-bb866038bb1e"  >
+</g>
+<g transform="matrix(5.15 0 0 5.15 540 540)"  >
+<g style="" vector-effect="non-scaling-stroke"   >
+		<g transform="matrix(1 0 0 1 0 0)"  >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,144,255); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-99.69, -99.67)" d="M 99.7000822 199.345425 C 44.6715107 199.55611100000002 -0.2484892599999995 154.53135 0 99.20182580000001 C 0.25055836 44.504682900000006 44.9515107 -0.3296027899999956 100.353416 1.4210854715202004e-14 C 154.962939 0.3256353000000142 199.814368 45.018968600000015 199.387701 100.51420700000001 C 198.968654 154.969445 154.570558 199.52182600000003 99.7000822 199.34542500000003" stroke-linecap="round" />
+</g>
+		<g transform="matrix(1 0 0 1 3.39 3.72)"  >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(255,255,255); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-103.08, -103.39)" d="M 112.082939 91.6172544 C 120.776273 92.8458258 129.273416 94.043921 138.033416 95.2820163 C 138.770558 92.6458258 139.397225 90.39820669999999 140.11532 87.82868289999999 C 131.105796 86.49534959999998 122.507701 85.22296859999999 113.27532 83.85725439999999 C 116.38008199999999 72.87058769999999 119.06198699999999 62.36582579999999 122.41627299999999 52.076301999999984 C 123.52103499999998 48.689635299999985 125.989606 45.51058769999999 128.50579599999998 42.880111499999984 C 131.80674899999997 39.43249239999999 136.37436799999998 40.19630199999998 139.17055799999997 43.984873399999984 C 140.34198699999996 45.571540099999986 141.44484399999996 47.24963529999998 142.84865399999998 48.60773049999998 C 144.641035 50.33915909999998 147.28293899999997 51.181063899999984 149.08293899999998 49.49534959999998 C 150.265796 48.388682899999985 150.22770099999997 45.78487339999998 150.33817699999997 43.826778199999985 C 150.38198699999998 43.04011149999999 149.45436799999996 42.114397199999985 148.81246299999998 41.388682899999985 C 145.686749 37.84963529999999 141.463892 36.59630199999999 137.004844 36.409635299999984 C 127.05627299999999 35.99249239999998 119.91722499999999 41.06487339999998 114.311511 48.73154009999998 C 108.75722499999999 56.329635299999985 106.321035 65.26296859999998 103.669606 74.09154009999997 C 102.89627300000001 76.66868289999998 102.233416 79.28011149999998 101.456273 82.10868289999998 C 91.7705584 80.70677819999997 82.4791298 79.36201629999998 72.917225 77.98106389999998 C 72.5781774 80.56201629999998 72.2619869 82.98296859999998 71.9248441 85.55439719999998 C 81.3915107 87.01154009999998 90.4486536 88.40392099999998 99.8086536 89.84392099999998 C 98.5553203 95.12392099999998 97.3877012 100.05153999999997 96.18770119999999 105.10677799999998 C 87.0067488 103.82296899999997 78.30198689999999 102.60963499999998 69.5381774 101.38296899999997 C 69.1667488 104.21344499999998 68.88674879999999 106.35249199999997 68.55532029999999 108.87058799999997 C 77.35722499999999 110.21534999999997 85.84293929999998 111.51058799999997 94.3857965 112.81534999999997 C 94.3857965 113.77915899999996 94.4905584 114.33915899999997 94.3686536 114.84773099999997 C 91.6429393 126.46487299999997 89.10770120000001 138.13344499999997 86.0505584 149.66106399999995 C 84.589606 155.15820699999995 82.2391298 160.46487299999995 77.669606 164.32773099999994 C 73.9077012 167.50677799999994 69.7743679 166.97534999999993 66.9457965 163.03058799999994 C 65.6677012 161.25344499999994 64.6010345 159.14296899999994 62.9134155 157.89725399999995 C 61.6810345 156.98487299999994 58.9381774 156.43630199999996 58.0334155 157.16773099999995 C 56.6924631 158.25344499999994 55.721034499999995 160.65534999999994 55.8353203 162.41915899999995 C 55.9324631 163.98296899999994 57.437225 165.81153999999995 58.818177399999996 166.87820699999995 C 63.471510699999996 170.46106399999994 68.9477012 170.98106399999995 74.4962726 169.88963499999994 C 83.78960599999999 168.05915899999994 90.3438917 162.26106399999995 94.4067488 154.06106399999993 C 97.5991298 147.61534999999992 99.98960600000001 140.73153999999994 102.248654 133.88011099999994 C 104.294368 127.67630199999994 105.682939 121.25534999999994 107.416273 114.71058799999994 C 116.543892 116.03439699999994 125.49055800000001 117.33153999999995 134.621987 118.65534999999994 C 135.376273 116.04963499999994 136.05627299999998 113.69153999999995 136.789606 111.15249199999994 C 127.23531999999999 109.74868299999994 118.11912999999998 108.40582599999993 108.924844 107.05344499999994 C 110.02960599999999 101.65725399999994 111.012463 96.85154009999994 112.082939 91.61725439999994" stroke-linecap="round" />
+</g>
+</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/app/images/logo/metamask-smart-transactions.png b/app/images/logo/metamask-smart-transactions.png
deleted file mode 100644
index 6eed753120bf..000000000000
Binary files a/app/images/logo/metamask-smart-transactions.png and /dev/null differ
diff --git a/app/images/ramps-card-activity-illustration.png b/app/images/ramps-card-activity-illustration.png
new file mode 100644
index 000000000000..0a0d839e8fc8
Binary files /dev/null and b/app/images/ramps-card-activity-illustration.png differ
diff --git a/app/images/ramps-card-nft-illustration.png b/app/images/ramps-card-nft-illustration.png
new file mode 100644
index 000000000000..1cbc824592f8
Binary files /dev/null and b/app/images/ramps-card-nft-illustration.png differ
diff --git a/app/images/ramps-card-token-illustration.png b/app/images/ramps-card-token-illustration.png
new file mode 100644
index 000000000000..7a226ede84db
Binary files /dev/null and b/app/images/ramps-card-token-illustration.png differ
diff --git a/app/images/scroll.svg b/app/images/scroll.svg
new file mode 100644
index 000000000000..456c75922ac5
--- /dev/null
+++ b/app/images/scroll.svg
@@ -0,0 +1,25 @@
+<svg version="1.1" id="scroll" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	 viewBox="0 0 300 300" style="enable-background:new 0 0 300 300;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFEEDA;}
+	.st1{fill:#EBC28E;}
+	.st2{fill:#190602;}
+</style>
+<circle class="st0" cx="150" cy="150" r="150"/>
+<g>
+	<path class="st1" d="M218.1,202.3c-0.3,10.1-8.6,18.2-18.7,18.2l-54.2-0.2c11.2-12.7,6.8-29.7,0.3-37.4h53.9
+		C209.9,182.9,218.4,191.8,218.1,202.3z"/>
+	<g>
+		<path class="st2" d="M85.2,131.8c-20.4-18.2-9.4-50.5,18.1-52h98.6c2.6,0.1,4.7,1.9,4.7,4.6v83.4c2.3,0.4,3.4,0.7,5.5,1.5
+			c1.7,0.6,4.2,2,4.2,2V84.3c-0.1-7.9-6.4-14.3-14.3-14.3h-98.6C82,70.4,64.9,87.8,64.9,109.2c0,12.4,5.6,23,14.9,30.5
+			c0.6,0.5,1.2,1.1,2.9,1.1c2.9,0,5-2.3,4.8-4.8C87.4,133.8,86.5,133.1,85.2,131.8z"/>
+		<path class="st2" d="M199.4,173.2H122c-5.2,0.1-9.4,4.3-9.4,9.5v11.1c0.1,5.2,4.5,9.6,9.7,9.6h5.8v-9.6h-5.8v-10.9
+			c0,0,1.4,0,3.2,0c9.7,0,16.9,9.1,16.9,18.8c-1.7,24.6-37.1,25.3-38.9,0v-94.3c0-4.2-3.5-7.7-7.8-7.7h-7.7v9.6h5.7v92.4
+			c-0.3,18.8,13.4,28.2,27.6,28.2l77.9,0.2C237,228.7,237.1,174.7,199.4,173.2z M218.1,202.3c-0.3,10.1-8.6,18.2-18.7,18.2
+			l-54.2-0.2c11.2-12.7,6.8-29.7,0.3-37.4h53.9C209.9,182.9,218.4,191.8,218.1,202.3z"/>
+		<path class="st2" d="M180.3,111.1h-60.1v-9.6h60.1c1.7,0,3,1.4,3,3v3.6C183.3,109.7,182,111.1,180.3,111.1z"/>
+		<path class="st2" d="M180.3,156.5h-60.1v-9.6h60.1c1.7,0,3,1.4,3,3v3.6C183.3,155.2,182,156.5,180.3,156.5z"/>
+		<path class="st2" d="M190.6,133.8h-70.4v-9.6h70.4c1.7,0,3,1.4,3,3v3.6C193.6,132.4,192.2,133.8,190.6,133.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/app/images/smart-transactions/smart-transactions-opt-in-background.svg b/app/images/smart-transactions/smart-transactions-opt-in-background.svg
new file mode 100644
index 000000000000..965a348c487a
--- /dev/null
+++ b/app/images/smart-transactions/smart-transactions-opt-in-background.svg
@@ -0,0 +1,8 @@
+<svg width="444" height="138" viewBox="0 0 444 138" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.7585 85.286C24.3036 73.1569 9.72668 60.5574 2.31547 42.3184C0.866282 38.7478 -0.546508 33.564 0.410729 29.715C2.65831 20.71 14.2046 19.5901 22.4169 21.6338C27.0426 22.7876 31.6482 26.5948 30.667 31.7296C29.8222 36.1537 25.6529 37.548 23.5868 41.507C21.1257 46.2253 23.4582 51.6853 26.368 55.8818C48.0537 87.1812 84.316 101.336 119.22 112.085C126.349 114.284 135.373 119.246 134.361 127.35C133.691 132.692 127.946 136.827 123.024 137.285C118.102 137.744 113.475 134.684 108.907 132.846C96.8532 127.994 84.7537 125.373 71.7538 125.663C60.5415 125.915 50.5994 125.719 48.9818 112.5C47.3576 99.2238 49.9728 94.6928 38.759 85.2798L38.7585 85.286Z" fill="#76C4FD" fill-opacity="0.3"/>
+<path d="M392.078 136.625C392.401 136.518 392.93 136.39 393.239 136.235C395.108 135.311 397.148 133.053 397.701 131.059C398.255 129.065 397.703 127.181 396.607 125.282C394.356 121.36 389.618 119.63 385.756 121.536C381.889 123.442 380.136 128.567 382.388 132.494C384.462 136.1 388.379 137.867 392.074 136.63L392.078 136.625ZM394.286 126.057C395.041 127.377 395.31 129.374 394.928 130.758C394.547 132.142 393.638 133.444 392.341 134.082C389.659 135.401 386.281 134.433 384.719 131.713C383.965 130.392 383.696 128.396 384.077 127.012C384.459 125.628 385.367 124.326 386.665 123.688C389.347 122.369 392.729 123.332 394.286 126.057Z" fill="#76C4FD" fill-opacity="0.3"/>
+<path d="M419.109 107.082C419.046 106.198 418.205 105.334 417.152 105.461C412.947 105.973 410.552 107.573 408.869 109.168C407.334 110.625 406.354 112.427 403.632 112.758C400.914 113.089 399.33 112.35 397.611 111.292C395.729 110.131 393.798 108.541 389.593 109.053C385.389 109.565 382.994 111.165 381.311 112.761C379.776 114.217 378.834 115.171 376.112 115.502C373.395 115.833 371.811 115.094 370.091 114.036C368.209 112.876 366.274 111.285 362.074 111.798C357.874 112.31 355.436 114.758 353.752 116.353C352.218 117.809 351.276 118.763 348.558 119.095C347.505 119.222 346.386 119.987 346.449 120.871C346.512 121.755 347.354 122.619 348.406 122.492C352.611 121.98 355.006 120.38 356.689 118.785C358.224 117.328 359.2 115.525 361.926 115.195C364.644 114.864 366.228 115.603 367.947 116.661C369.829 117.821 371.765 119.412 375.965 118.899C380.169 118.387 382.564 116.788 384.247 115.192C385.782 113.736 386.724 112.782 389.446 112.451C392.163 112.12 393.747 112.859 395.467 113.917C397.349 115.077 399.28 116.667 403.484 116.155C407.689 115.643 410.122 113.195 411.806 111.6C413.34 110.143 414.282 109.189 417 108.858C418.053 108.731 419.172 107.966 419.109 107.082Z" fill="#76C4FD" fill-opacity="0.3"/>
+<path d="M385.902 20.0886C375.006 11.3651 386.703 8.32716 393.914 7.89865C490.535 8.16392 420.328 77.5128 404.813 94.9542C389.298 112.396 376.584 94.6794 394.813 62.8099C413.042 30.9404 399.522 30.993 385.902 20.0886Z" fill="#76C4FD" fill-opacity="0.3"/>
+<path d="M111.017 42.8522C110.969 43.3733 111.108 43.3058 110.777 43.6811C110.217 44.3062 108.55 43.6826 107.639 43.4664L76.887 36.8208C75.8585 36.5735 74.6399 35.7241 74.2217 34.7049C73.8035 33.6856 73.813 32.6264 74.4584 31.931L96.3383 9.30094C96.9726 8.61122 98.242 8.27895 99.2403 8.64305C100.244 9.00118 101.593 9.73282 101.906 10.759L110.657 41.4246C110.766 41.7981 111.043 42.5045 111.012 42.8582L111.017 42.8522ZM82.9337 32.7316L103.82 38.2107L97.1337 16.5981L82.9337 32.7316Z" fill="#76C2FB" fill-opacity="0.3"/>
+<path d="M91.0354 82.8282C91.4902 82.6571 92.2325 82.4475 92.67 82.205C95.3197 80.7616 98.2742 77.3345 99.1471 74.3549C100.02 71.3753 99.3489 68.602 97.9226 65.8266C94.9919 60.0949 88.4875 57.7111 83.0153 60.6872C77.5355 63.6643 74.832 71.3339 77.7636 77.0729C80.4631 82.3424 85.8236 84.8128 91.0289 82.8365L91.0354 82.8282ZM94.6525 67.0658C95.6345 68.9954 95.9057 71.9472 95.3039 74.0148C94.702 76.0824 93.3702 78.0488 91.5313 79.0453C87.7316 81.106 83.0813 79.7992 81.0479 75.8244C80.0659 73.8949 79.7947 70.943 80.3966 68.8754C80.9984 66.8078 82.3302 64.8414 84.1691 63.8449C87.9688 61.7842 92.6257 63.0827 94.6525 67.0658Z" fill="#76C4FD" fill-opacity="0.3"/>
+</svg>
diff --git a/app/loading.html b/app/loading.html
index dd5902a09a39..1c85bd296cc6 100644
--- a/app/loading.html
+++ b/app/loading.html
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
-  <script src="./snow.js" type="text/javascript"  charset="utf-8"></script>
-  <script src="./use-snow.js" type="text/javascript" charset="utf-8"></script>
   <meta charset="UTF-8">
+  <% if (it.shouldIncludeSnow) { %>
+  <script src="./scripts/snow.js"></script>
+  <script src="./scripts/use-snow.js"></script>
+  <% } %>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>MetaMask Loading</title>
diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
index c130b94ae1fb..4197c535972e 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/v2/_base.json
@@ -31,12 +31,12 @@
     {
       "matches": ["file://*/*", "http://*/*", "https://*/*"],
       "js": [
-        "disable-console.js",
-        "lockdown-install.js",
-        "lockdown-run.js",
-        "lockdown-more.js",
-        "contentscript.js",
-        "inpage.js"
+        "scripts/disable-console.js",
+        "scripts/lockdown-install.js",
+        "scripts/lockdown-run.js",
+        "scripts/lockdown-more.js",
+        "scripts/contentscript.js",
+        "scripts/inpage.js"
       ],
       "run_at": "document_start",
       "all_frames": true
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
index 42df2d437671..39e96825add8 100644
--- a/app/manifest/v3/_base.json
+++ b/app/manifest/v3/_base.json
@@ -14,7 +14,7 @@
   },
   "author": "https://metamask.io",
   "background": {
-    "service_worker": "app-init.js"
+    "service_worker": "scripts/app-init.js"
   },
   "commands": {
     "_execute_browser_action": {
@@ -30,11 +30,11 @@
     {
       "matches": ["file://*/*", "http://*/*", "https://*/*"],
       "js": [
-        "disable-console.js",
-        "lockdown-install.js",
-        "lockdown-run.js",
-        "lockdown-more.js",
-        "contentscript.js"
+        "scripts/disable-console.js",
+        "scripts/lockdown-install.js",
+        "scripts/lockdown-run.js",
+        "scripts/lockdown-more.js",
+        "scripts/contentscript.js"
       ],
       "run_at": "document_start",
       "all_frames": true
diff --git a/app/manifest/v3/chrome.json b/app/manifest/v3/chrome.json
index e056267926d5..79656e26f0f9 100644
--- a/app/manifest/v3/chrome.json
+++ b/app/manifest/v3/chrome.json
@@ -1,6 +1,6 @@
 {
   "content_security_policy": {
-    "extension_pages": "script-src 'self'; object-src 'none'; frame-ancestors 'none';"
+    "extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'none'; frame-ancestors 'none';"
   },
   "externally_connectable": {
     "matches": ["https://metamask.io/*"],
diff --git a/app/notification.html b/app/notification.html
index a0e0f6dcf5a7..70f02e9ab421 100644
--- a/app/notification.html
+++ b/app/notification.html
@@ -32,7 +32,7 @@
         margin-top: 1rem;
       }
     </style>
-    <link rel="stylesheet" type="text/css" href="./index.css" />
+    <link rel="stylesheet" href="./index.css" />
   </head>
   <body class="notification">
     <div id="app-content">
@@ -50,11 +50,6 @@
       />
     </div>
     <div id="popover-content"></div>
-    <script
-      src="./load-app.js"
-      type="text/javascript"
-      charset="utf-8"
-      async
-    ></script>
+    <script src="./load-app.js" async></script>
   </body>
 </html>
diff --git a/app/popup.html b/app/popup.html
index c27442faa6af..296b0ceae711 100644
--- a/app/popup.html
+++ b/app/popup.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
     <title>MetaMask</title>
-    <link rel="stylesheet" type="text/css" href="./index.css">
+    <link rel="stylesheet" href="./index.css">
   </head>
   <body style="width:357px; height:600px;">
     <div id="app-content">
@@ -12,6 +12,6 @@
       <img class="loading-spinner" src="./images/spinner.gif" alt="" loading="lazy" />
     </div>
     <div id="popover-content"></div>
-    <script src="./load-app.js" type="text/javascript" charset="utf-8" async></script>
+    <script src="./load-app.js" async></script>
   </body>
 </html>
diff --git a/app/scripts/app-init.js b/app/scripts/app-init.js
index 579f2b96bdca..e58f760095a8 100644
--- a/app/scripts/app-init.js
+++ b/app/scripts/app-init.js
@@ -1,14 +1,12 @@
-/* global chrome */
 // This file is used only for manifest version 3
 
 // Represents if importAllScripts has been run
 // eslint-disable-next-line
 let scriptsLoadInitiated = false;
-
+const { chrome } = globalThis;
 const testMode = process.env.IN_TEST;
 
 const loadTimeLogs = [];
-
 // eslint-disable-next-line import/unambiguous
 function tryImport(...fileNames) {
   try {
@@ -51,33 +49,41 @@ function importAllScripts() {
 
   const startImportScriptsTime = Date.now();
 
+  // value of useSnow below is dynamically replaced at build time with actual value
+  const useSnow = process.env.USE_SNOW;
+  if (typeof useSnow !== 'boolean') {
+    throw new Error('Missing USE_SNOW environment variable');
+  }
+
   // value of applyLavaMoat below is dynamically replaced at build time with actual value
   const applyLavaMoat = process.env.APPLY_LAVAMOAT;
   if (typeof applyLavaMoat !== 'boolean') {
     throw new Error('Missing APPLY_LAVAMOAT environment variable');
   }
 
-  loadFile('./sentry-install.js');
+  loadFile('../scripts/sentry-install.js');
 
-  // eslint-disable-next-line no-undef
-  const isWorker = !self.document;
-  if (!isWorker) {
-    loadFile('./snow.js');
-  }
+  if (useSnow) {
+    // eslint-disable-next-line no-undef
+    const isWorker = !self.document;
+    if (!isWorker) {
+      loadFile('../scripts/snow.js');
+    }
 
-  loadFile('./use-snow.js');
+    loadFile('../scripts/use-snow.js');
+  }
 
   // Always apply LavaMoat in e2e test builds, so that we can capture initialization stats
   if (testMode || applyLavaMoat) {
-    loadFile('./runtime-lavamoat.js');
-    loadFile('./lockdown-more.js');
-    loadFile('./policy-load.js');
+    loadFile('../scripts/runtime-lavamoat.js');
+    loadFile('../scripts/lockdown-more.js');
+    loadFile('../scripts/policy-load.js');
   } else {
-    loadFile('./init-globals.js');
-    loadFile('./lockdown-install.js');
-    loadFile('./lockdown-run.js');
-    loadFile('./lockdown-more.js');
-    loadFile('./runtime-cjs.js');
+    loadFile('../scripts/init-globals.js');
+    loadFile('../scripts/lockdown-install.js');
+    loadFile('../scripts/lockdown-run.js');
+    loadFile('../scripts/lockdown-more.js');
+    loadFile('../scripts/runtime-cjs.js');
   }
 
   // This environment variable is set to a string of comma-separated relative file paths.
@@ -145,7 +151,7 @@ const registerInPageContentScript = async () => {
       {
         id: 'inpage',
         matches: ['file://*/*', 'http://*/*', 'https://*/*'],
-        js: ['inpage.js'],
+        js: ['scripts/inpage.js'],
         runAt: 'document_start',
         world: 'MAIN',
       },
diff --git a/app/scripts/background.js b/app/scripts/background.js
index f154dbb10a0a..ba0d940ce657 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -61,7 +61,11 @@ import rawFirstTimeState from './first-time-state';
 import getFirstPreferredLangCode from './lib/get-first-preferred-lang-code';
 import getObjStructure from './lib/getObjStructure';
 import setupEnsIpfsResolver from './lib/ens-ipfs/setup';
-import { deferredPromise, getPlatform } from './lib/util';
+import {
+  deferredPromise,
+  getPlatform,
+  shouldEmitDappViewedEvent,
+} from './lib/util';
 
 /* eslint-enable import/first */
 
@@ -283,13 +287,16 @@ async function initialize() {
     ///: END:ONLY_INCLUDE_IF
 
     let isFirstMetaMaskControllerSetup;
+
     if (isManifestV3) {
       // Save the timestamp immediately and then every `SAVE_TIMESTAMP_INTERVAL`
       // miliseconds. This keeps the service worker alive.
-      const SAVE_TIMESTAMP_INTERVAL_MS = 2 * 1000;
+      if (initState.PreferencesController?.enableMV3TimestampSave) {
+        const SAVE_TIMESTAMP_INTERVAL_MS = 2 * 1000;
 
-      saveTimestamp();
-      setInterval(saveTimestamp, SAVE_TIMESTAMP_INTERVAL_MS);
+        saveTimestamp();
+        setInterval(saveTimestamp, SAVE_TIMESTAMP_INTERVAL_MS);
+      }
 
       const sessionData = await browser.storage.session.get([
         'isFirstMetaMaskControllerSetup',
@@ -466,6 +473,11 @@ function emitDappViewedMetricEvent(
   connectSitePermissions,
   preferencesController,
 ) {
+  const { metaMetricsId } = controller.metaMetricsController.state;
+  if (!shouldEmitDappViewedEvent(metaMetricsId)) {
+    return;
+  }
+
   // A dapp may have other permissions than eth_accounts.
   // Since we are only interested in dapps that use Ethereum accounts, we bail out otherwise.
   if (!hasProperty(connectSitePermissions.permissions, 'eth_accounts')) {
diff --git a/app/scripts/constants/contracts.ts b/app/scripts/constants/contracts.ts
index 27fa0606dfba..bc27be31d95c 100644
--- a/app/scripts/constants/contracts.ts
+++ b/app/scripts/constants/contracts.ts
@@ -12,4 +12,9 @@ export const SINGLE_CALL_BALANCES_ADDRESSES = {
   [CHAIN_IDS.FANTOM]: '0x07f697424ABe762bB808c109860c04eA488ff92B',
   [CHAIN_IDS.ARBITRUM]: '0x151E24A486D7258dd7C33Fb67E4bB01919B7B32c',
   [CHAIN_IDS.BLAST]: '0xfd5730e96f9dffae40d99b77015bd42816280998',
+  [CHAIN_IDS.LINEA_GOERLI]: '0x10dAd7Ca3921471f616db788D9300DC97Db01783',
+  [CHAIN_IDS.LINEA_MAINNET]: '0xF62e6a41561b3650a69Bb03199C735e3E3328c0D',
+  [CHAIN_IDS.AURORA]: '0x1286415D333855237f89Df27D388127181448538',
+  [CHAIN_IDS.BASE]: '0x6AA75276052D96696134252587894ef5FFA520af',
+  [CHAIN_IDS.ZKSYNC_ERA]: '0x458fEd3144680a5b8bcfaa0F9594aa19B4Ea2D34',
 };
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 8d63ec70ac5e..1fd661dc2a2d 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -5,7 +5,10 @@ import pump from 'pump';
 import { obj as createThoughStream } from 'through2';
 import browser from 'webextension-polyfill';
 import { EXTENSION_MESSAGES } from '../../shared/constants/app';
-import { checkForLastError } from '../../shared/modules/browser-runtime.utils';
+import {
+  checkForLastError,
+  getIsBrowserPrerenderBroken,
+} from '../../shared/modules/browser-runtime.utils';
 import { isManifestV3 } from '../../shared/modules/mv3.utils';
 import shouldInjectProvider from '../../shared/modules/provider-injection';
 
@@ -519,11 +522,7 @@ const start = () => {
   if (shouldInjectProvider()) {
     initStreams();
 
-    // https://bugs.chromium.org/p/chromium/issues/detail?id=1457040
-    // Temporary workaround for chromium bug that breaks the content script <=> background connection
-    // for prerendered pages. This resets potentially broken extension streams if a page transitions
-    // from the prerendered state to the active state.
-    if (document.prerendering) {
+    if (document.prerendering && getIsBrowserPrerenderBroken()) {
       document.addEventListener('prerenderingchange', () => {
         onDisconnectDestroyStreams(
           new Error('Prerendered page has become active.'),
diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index 44d1a367362e..dea6f4cdb97b 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -48,7 +48,6 @@ export default class AppStateController extends EventEmitter {
       showTestnetMessageInDropdown: true,
       showBetaHeader: isBeta(),
       showPermissionsTour: true,
-      showProductTour: true,
       showNetworkBanner: true,
       showAccountBanner: true,
       trezorModel: null,
@@ -67,6 +66,10 @@ export default class AppStateController extends EventEmitter {
       },
       surveyLinkLastClickedOrClosed: null,
       signatureSecurityAlertResponses: {},
+      // States used for displaying the changed network toast
+      switchedNetworkDetails: null,
+      switchedNetworkNeverShowMessage: false,
+      currentExtensionPopupId: 0,
     });
     this.timer = null;
 
@@ -374,15 +377,6 @@ export default class AppStateController extends EventEmitter {
     this.store.updateState({ showPermissionsTour });
   }
 
-  /**
-   * Sets whether the product tour should be shown
-   *
-   * @param showProductTour
-   */
-  setShowProductTour(showProductTour) {
-    this.store.updateState({ showProductTour });
-  }
-
   /**
    * Sets whether the Network Banner should be shown
    *
@@ -401,6 +395,45 @@ export default class AppStateController extends EventEmitter {
     this.store.updateState({ showAccountBanner });
   }
 
+  /**
+   * Sets a unique ID for the current extension popup
+   *
+   * @param currentExtensionPopupId
+   */
+  setCurrentExtensionPopupId(currentExtensionPopupId) {
+    this.store.updateState({ currentExtensionPopupId });
+  }
+
+  /**
+   * Sets an object with networkName and appName
+   * or `null` if the message is meant to be cleared
+   *
+   * @param {{ origin: string, networkClientId: string } | null} switchedNetworkDetails - Details about the network that MetaMask just switched to.
+   */
+  setSwitchedNetworkDetails(switchedNetworkDetails) {
+    this.store.updateState({ switchedNetworkDetails });
+  }
+
+  /**
+   * Clears the switched network details in state
+   */
+  clearSwitchedNetworkDetails() {
+    this.store.updateState({ switchedNetworkDetails: null });
+  }
+
+  /**
+   * Remembers if the user prefers to never see the
+   * network switched message again
+   *
+   * @param {boolean} switchedNetworkNeverShowMessage
+   */
+  setSwitchedNetworkNeverShowMessage(switchedNetworkNeverShowMessage) {
+    this.store.updateState({
+      switchedNetworkDetails: null,
+      switchedNetworkNeverShowMessage,
+    });
+  }
+
   /**
    * Sets a property indicating the model of the user's Trezor hardware wallet
    *
diff --git a/app/scripts/controllers/authentication/auth-snap-requests.ts b/app/scripts/controllers/authentication/auth-snap-requests.ts
new file mode 100644
index 000000000000..81c8beaafd40
--- /dev/null
+++ b/app/scripts/controllers/authentication/auth-snap-requests.ts
@@ -0,0 +1,32 @@
+import type { SnapId } from '@metamask/snaps-sdk';
+import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import { HandlerType } from '@metamask/snaps-utils';
+
+type SnapRPCRequest = Parameters<HandleSnapRequest['handler']>[0];
+
+const snapId = 'npm:@metamask/message-signing-snap' as SnapId;
+
+export function createSnapPublicKeyRequest(): SnapRPCRequest {
+  return {
+    snapId,
+    origin: '',
+    handler: HandlerType.OnRpcRequest,
+    request: {
+      method: 'getPublicKey',
+    },
+  };
+}
+
+export function createSnapSignMessageRequest(
+  message: `metamask:${string}`,
+): SnapRPCRequest {
+  return {
+    snapId,
+    origin: '',
+    handler: HandlerType.OnRpcRequest,
+    request: {
+      method: 'signMessage',
+      params: { message },
+    },
+  };
+}
diff --git a/app/scripts/controllers/authentication/authentication-controller.test.ts b/app/scripts/controllers/authentication/authentication-controller.test.ts
new file mode 100644
index 000000000000..db20a5a85043
--- /dev/null
+++ b/app/scripts/controllers/authentication/authentication-controller.test.ts
@@ -0,0 +1,294 @@
+import { ControllerMessenger } from '@metamask/base-controller';
+import AuthenticationController, {
+  AllowedActions,
+  AuthenticationControllerState,
+} from './authentication-controller';
+import {
+  MOCK_ACCESS_TOKEN,
+  MOCK_LOGIN_RESPONSE,
+  mockEndpointAccessToken,
+  mockEndpointGetNonce,
+  mockEndpointLogin,
+} from './mocks/mockServices';
+
+const mockSignedInState = (): AuthenticationControllerState => ({
+  isSignedIn: true,
+  sessionData: {
+    accessToken: 'MOCK_ACCESS_TOKEN',
+    expiresIn: new Date().toString(),
+    profile: {
+      identifierId: MOCK_LOGIN_RESPONSE.profile.identifier_id,
+      profileId: MOCK_LOGIN_RESPONSE.profile.profile_id,
+      metametricsId: MOCK_LOGIN_RESPONSE.profile.metametrics_id,
+    },
+  },
+});
+
+describe('authentication/authentication-controller - constructor() tests', () => {
+  test('should initialize with default state', () => {
+    const controller = new AuthenticationController({
+      messenger: createAuthenticationMessenger(),
+    });
+
+    expect(controller.state.isSignedIn).toBe(false);
+    expect(controller.state.sessionData).toBeUndefined();
+  });
+
+  test('should initialize with override state', () => {
+    const controller = new AuthenticationController({
+      messenger: createAuthenticationMessenger(),
+      state: mockSignedInState(),
+    });
+
+    expect(controller.state.isSignedIn).toBe(true);
+    expect(controller.state.sessionData).toBeDefined();
+  });
+});
+
+describe('authentication/authentication-controller - performSignIn() tests', () => {
+  test('Should create access token and update state', async () => {
+    const mockEndpoints = mockAuthenticationFlowEndpoints();
+    const { messenger, mockSnapGetPublicKey, mockSnapSignMessage } =
+      createMockAuthenticationMessenger();
+
+    const controller = new AuthenticationController({ messenger });
+
+    const result = await controller.performSignIn();
+    expect(mockSnapGetPublicKey).toBeCalled();
+    expect(mockSnapSignMessage).toBeCalled();
+    mockEndpoints.mockGetNonceEndpoint.done();
+    mockEndpoints.mockLoginEndpoint.done();
+    mockEndpoints.mockAccessTokenEndpoint.done();
+    expect(result).toBe(MOCK_ACCESS_TOKEN);
+
+    // Assert - state shows user is logged in
+    expect(controller.state.isSignedIn).toBe(true);
+    expect(controller.state.sessionData).toBeDefined();
+  });
+
+  test('Should error when nonce endpoint fails', async () => {
+    await testAndAssertFailingEndpoints('nonce');
+  });
+
+  test('Should error when login endpoint fails', async () => {
+    await testAndAssertFailingEndpoints('login');
+  });
+
+  test('Should error when tokens endpoint fails', async () => {
+    await testAndAssertFailingEndpoints('token');
+  });
+
+  async function testAndAssertFailingEndpoints(
+    endpointFail: 'nonce' | 'login' | 'token',
+  ) {
+    const mockEndpoints = mockAuthenticationFlowEndpoints({
+      endpointFail,
+    });
+    const { messenger } = createMockAuthenticationMessenger();
+    const controller = new AuthenticationController({ messenger });
+
+    await expect(controller.performSignIn()).rejects.toThrow();
+    expect(controller.state.isSignedIn).toBe(false);
+
+    const endpointsCalled = [
+      mockEndpoints.mockGetNonceEndpoint.isDone(),
+      mockEndpoints.mockLoginEndpoint.isDone(),
+      mockEndpoints.mockAccessTokenEndpoint.isDone(),
+    ];
+    if (endpointFail === 'nonce') {
+      expect(endpointsCalled).toEqual([true, false, false]);
+    }
+
+    if (endpointFail === 'login') {
+      expect(endpointsCalled).toEqual([true, true, false]);
+    }
+
+    if (endpointFail === 'token') {
+      expect(endpointsCalled).toEqual([true, true, true]);
+    }
+  }
+});
+
+describe('authentication/authentication-controller - performSignOut() tests', () => {
+  test('Should remove signed in user and any access tokens', () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    const controller = new AuthenticationController({
+      messenger,
+      state: mockSignedInState(),
+    });
+
+    controller.performSignOut();
+    expect(controller.state.isSignedIn).toBe(false);
+    expect(controller.state.sessionData).toBeUndefined();
+  });
+
+  test('Should throw error if attempting to sign out when user is not logged in', () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    const controller = new AuthenticationController({
+      messenger,
+      state: { isSignedIn: false },
+    });
+
+    expect(() => controller.performSignOut()).toThrow();
+  });
+});
+
+describe('authentication/authentication-controller - getBearerToken() tests', () => {
+  test('Should throw error if not logged in', async () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    const controller = new AuthenticationController({
+      messenger,
+      state: { isSignedIn: false },
+    });
+
+    await expect(controller.getBearerToken()).rejects.toThrow();
+  });
+
+  test('Should return original access token in state', async () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    const originalState = mockSignedInState();
+    const controller = new AuthenticationController({
+      messenger,
+      state: originalState,
+    });
+
+    const result = await controller.getBearerToken();
+    expect(result).toBeDefined();
+    expect(result).toBe(originalState.sessionData?.accessToken);
+  });
+
+  test('Should return new access token if state is invalid', async () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    mockAuthenticationFlowEndpoints();
+    const originalState = mockSignedInState();
+    if (originalState.sessionData) {
+      originalState.sessionData.accessToken = 'ACCESS_TOKEN_1';
+
+      const d = new Date();
+      d.setMinutes(d.getMinutes() - 31); // expires at 30 mins
+      originalState.sessionData.expiresIn = d.toString();
+    }
+
+    const controller = new AuthenticationController({
+      messenger,
+      state: originalState,
+    });
+
+    const result = await controller.getBearerToken();
+    expect(result).toBeDefined();
+    expect(result).toBe(MOCK_ACCESS_TOKEN);
+  });
+});
+
+describe('authentication/authentication-controller - getSessionProfile() tests', () => {
+  test('Should throw error if not logged in', async () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    const controller = new AuthenticationController({
+      messenger,
+      state: { isSignedIn: false },
+    });
+
+    await expect(controller.getSessionProfile()).rejects.toThrow();
+  });
+
+  test('Should return original access token in state', async () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    const originalState = mockSignedInState();
+    const controller = new AuthenticationController({
+      messenger,
+      state: originalState,
+    });
+
+    const result = await controller.getSessionProfile();
+    expect(result).toBeDefined();
+    expect(result).toEqual(originalState.sessionData?.profile);
+  });
+
+  test('Should return new access token if state is invalid', async () => {
+    const { messenger } = createMockAuthenticationMessenger();
+    mockAuthenticationFlowEndpoints();
+    const originalState = mockSignedInState();
+    if (originalState.sessionData) {
+      originalState.sessionData.profile.identifierId = 'ID_1';
+
+      const d = new Date();
+      d.setMinutes(d.getMinutes() - 31); // expires at 30 mins
+      originalState.sessionData.expiresIn = d.toString();
+    }
+
+    const controller = new AuthenticationController({
+      messenger,
+      state: originalState,
+    });
+
+    const result = await controller.getSessionProfile();
+    expect(result).toBeDefined();
+    expect(result.identifierId).toBe(MOCK_LOGIN_RESPONSE.profile.identifier_id);
+    expect(result.profileId).toBe(MOCK_LOGIN_RESPONSE.profile.profile_id);
+    expect(result.metametricsId).toBe(
+      MOCK_LOGIN_RESPONSE.profile.metametrics_id,
+    );
+  });
+});
+
+function createAuthenticationMessenger() {
+  const messenger = new ControllerMessenger<AllowedActions, never>();
+  return messenger.getRestricted({
+    name: 'AuthenticationController',
+    allowedActions: [`SnapController:handleRequest`],
+  });
+}
+
+function createMockAuthenticationMessenger() {
+  const messenger = createAuthenticationMessenger();
+  const mockCall = jest.spyOn(messenger, 'call');
+  const mockSnapGetPublicKey = jest.fn().mockResolvedValue('MOCK_PUBLIC_KEY');
+  const mockSnapSignMessage = jest
+    .fn()
+    .mockResolvedValue('MOCK_SIGNED_MESSAGE');
+
+  mockCall.mockImplementation((...args) => {
+    const [actionType, params] = args;
+    if (actionType === 'SnapController:handleRequest') {
+      if (params?.request.method === 'getPublicKey') {
+        return mockSnapGetPublicKey();
+      }
+
+      if (params?.request.method === 'signMessage') {
+        return mockSnapSignMessage();
+      }
+
+      throw new Error(
+        `MOCK_FAIL - unsupported SnapController:handleRequest call: ${params?.request.method}`,
+      );
+    }
+
+    function exhaustedMessengerMocks(action: never) {
+      throw new Error(`MOCK_FAIL - unsupported messenger call: ${action}`);
+    }
+
+    return exhaustedMessengerMocks(actionType);
+  });
+
+  return { messenger, mockSnapGetPublicKey, mockSnapSignMessage };
+}
+
+function mockAuthenticationFlowEndpoints(params?: {
+  endpointFail: 'nonce' | 'login' | 'token';
+}) {
+  const mockGetNonceEndpoint = mockEndpointGetNonce(
+    params?.endpointFail === 'nonce' ? { status: 500 } : undefined,
+  );
+  const mockLoginEndpoint = mockEndpointLogin(
+    params?.endpointFail === 'login' ? { status: 500 } : undefined,
+  );
+  const mockAccessTokenEndpoint = mockEndpointAccessToken(
+    params?.endpointFail === 'token' ? { status: 500 } : undefined,
+  );
+
+  return {
+    mockGetNonceEndpoint,
+    mockLoginEndpoint,
+    mockAccessTokenEndpoint,
+  };
+}
diff --git a/app/scripts/controllers/authentication/authentication-controller.ts b/app/scripts/controllers/authentication/authentication-controller.ts
new file mode 100644
index 000000000000..b8a0b964827b
--- /dev/null
+++ b/app/scripts/controllers/authentication/authentication-controller.ts
@@ -0,0 +1,304 @@
+import {
+  BaseController,
+  RestrictedControllerMessenger,
+  StateMetadata,
+} from '@metamask/base-controller';
+import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import {
+  createSnapPublicKeyRequest,
+  createSnapSignMessageRequest,
+} from './auth-snap-requests';
+import {
+  createLoginRawMessage,
+  getAccessToken,
+  getNonce,
+  login,
+} from './services';
+
+const THIRTY_MIN_MS = 1000 * 60 * 30;
+
+const controllerName = 'AuthenticationController';
+
+// State
+type SessionProfile = {
+  identifierId: string;
+  profileId: string;
+  metametricsId: string;
+};
+
+type SessionData = {
+  /** profile - anonymous profile data for the given logged in user */
+  profile: SessionProfile;
+  /** accessToken - used to make requests authorized endpoints */
+  accessToken: string;
+  /** expiresIn - string date to determine if new access token is required  */
+  expiresIn: string;
+};
+
+export type AuthenticationControllerState = {
+  /**
+   * Global isSignedIn state.
+   * Can be used to determine if "Profile Syncing" is enabled.
+   */
+  isSignedIn: boolean;
+  sessionData?: SessionData;
+};
+const defaultState: AuthenticationControllerState = { isSignedIn: false };
+const metadata: StateMetadata<AuthenticationControllerState> = {
+  isSignedIn: {
+    persist: true,
+    anonymous: true,
+  },
+  sessionData: {
+    persist: true,
+    anonymous: false,
+  },
+};
+
+// Messenger Actions
+type CreateActionsObj<T extends keyof AuthenticationController> = {
+  [K in T]: {
+    type: `${typeof controllerName}:${K}`;
+    handler: AuthenticationController[K];
+  };
+};
+type ActionsObj = CreateActionsObj<
+  | 'performSignIn'
+  | 'performSignOut'
+  | 'getBearerToken'
+  | 'getSessionProfile'
+  | 'isSignedIn'
+>;
+export type Actions = ActionsObj[keyof ActionsObj];
+export type AuthenticationControllerPerformSignIn = ActionsObj['performSignIn'];
+export type AuthenticationControllerPerformSignOut =
+  ActionsObj['performSignOut'];
+export type AuthenticationControllerGetBearerToken =
+  ActionsObj['getBearerToken'];
+export type AuthenticationControllerGetSessionProfile =
+  ActionsObj['getSessionProfile'];
+export type AuthenticationControllerIsSignedIn = ActionsObj['isSignedIn'];
+
+// Allowed Actions
+export type AllowedActions = HandleSnapRequest;
+
+// Messenger
+export type AuthenticationControllerMessenger = RestrictedControllerMessenger<
+  typeof controllerName,
+  Actions | AllowedActions,
+  never,
+  AllowedActions['type'],
+  never
+>;
+
+/**
+ * Controller that enables authentication for restricted endpoints.
+ * Used for Global Profile Syncing and Notifications
+ */
+export default class AuthenticationController extends BaseController<
+  typeof controllerName,
+  AuthenticationControllerState,
+  AuthenticationControllerMessenger
+> {
+  constructor({
+    messenger,
+    state,
+  }: {
+    messenger: AuthenticationControllerMessenger;
+    state?: AuthenticationControllerState;
+  }) {
+    super({
+      messenger,
+      metadata,
+      name: controllerName,
+      state: { ...defaultState, ...state },
+    });
+
+    this.#registerMessageHandlers();
+  }
+
+  /**
+   * Constructor helper for registering this controller's messaging system
+   * actions.
+   */
+  #registerMessageHandlers(): void {
+    this.messagingSystem.registerActionHandler(
+      'AuthenticationController:getBearerToken',
+      this.getBearerToken.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'AuthenticationController:getSessionProfile',
+      this.getSessionProfile.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'AuthenticationController:isSignedIn',
+      this.isSignedIn.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'AuthenticationController:performSignIn',
+      this.performSignIn.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'AuthenticationController:performSignOut',
+      this.performSignOut.bind(this),
+    );
+  }
+
+  public async performSignIn(): Promise<string> {
+    const { accessToken } = await this.#performAuthenticationFlow();
+    return accessToken;
+  }
+
+  public performSignOut(): void {
+    this.#assertLoggedIn();
+
+    this.update((state) => {
+      state.isSignedIn = false;
+      state.sessionData = undefined;
+    });
+  }
+
+  public async getBearerToken(): Promise<string> {
+    this.#assertLoggedIn();
+
+    if (this.#hasValidSession(this.state.sessionData)) {
+      return this.state.sessionData.accessToken;
+    }
+
+    const { accessToken } = await this.#performAuthenticationFlow();
+    return accessToken;
+  }
+
+  /**
+   * Will return a session profile.
+   * Throws if a user is not logged in.
+   *
+   * @returns profile for the session.
+   */
+  public async getSessionProfile(): Promise<SessionProfile> {
+    this.#assertLoggedIn();
+
+    if (this.#hasValidSession(this.state.sessionData)) {
+      return this.state.sessionData.profile;
+    }
+
+    const { profile } = await this.#performAuthenticationFlow();
+    return profile;
+  }
+
+  public isSignedIn(): boolean {
+    return this.state.isSignedIn;
+  }
+
+  #assertLoggedIn(): void {
+    if (!this.state.isSignedIn) {
+      throw new Error(
+        `${controllerName}: Unable to call method, user is not authenticated`,
+      );
+    }
+  }
+
+  async #performAuthenticationFlow(): Promise<{
+    profile: SessionProfile;
+    accessToken: string;
+  }> {
+    try {
+      // 1. Nonce
+      const publicKey = await this.#snapGetPublicKey();
+      const nonce = await getNonce(publicKey);
+      if (!nonce) {
+        throw new Error(`Unable to get nonce`);
+      }
+
+      // 2. Login
+      const rawMessage = createLoginRawMessage(nonce, publicKey);
+      const signature = await this.#snapSignMessage(rawMessage);
+      const loginResponse = await login(rawMessage, signature);
+      if (!loginResponse?.token) {
+        throw new Error(`Unable to login`);
+      }
+
+      const profile: SessionProfile = {
+        identifierId: loginResponse.profile.identifier_id,
+        profileId: loginResponse.profile.profile_id,
+        metametricsId: loginResponse.profile.metametrics_id,
+      };
+
+      // 3. Trade for Access Token
+      const accessToken = await getAccessToken(loginResponse.token);
+      if (!accessToken) {
+        throw new Error(`Unable to get Access Token`);
+      }
+
+      // Update Internal State
+      this.update((state) => {
+        state.isSignedIn = true;
+        const expiresIn = new Date();
+        expiresIn.setTime(expiresIn.getTime() + THIRTY_MIN_MS);
+        state.sessionData = {
+          profile,
+          accessToken,
+          expiresIn: expiresIn.toString(),
+        };
+      });
+
+      return {
+        profile,
+        accessToken,
+      };
+    } catch (e) {
+      const errorMessage =
+        e instanceof Error ? e.message : JSON.stringify(e ?? '');
+      throw new Error(
+        `${controllerName}: Failed to authenticate - ${errorMessage}`,
+      );
+    }
+  }
+
+  #hasValidSession(
+    sessionData: SessionData | undefined,
+  ): sessionData is SessionData {
+    if (!sessionData) {
+      return false;
+    }
+
+    const prevDate = Date.parse(sessionData.expiresIn);
+    if (isNaN(prevDate)) {
+      return false;
+    }
+
+    const currentDate = new Date();
+    const diffMs = Math.abs(currentDate.getTime() - prevDate);
+
+    return THIRTY_MIN_MS > diffMs;
+  }
+
+  /**
+   * Returns the auth snap public key.
+   *
+   * @returns The snap public key.
+   */
+  #snapGetPublicKey(): Promise<string> {
+    return this.messagingSystem.call(
+      'SnapController:handleRequest',
+      createSnapPublicKeyRequest(),
+    ) as Promise<string>;
+  }
+
+  /**
+   * Signs a specific message using an underlying auth snap.
+   *
+   * @param message - A specific tagged message to sign.
+   * @returns A Signature created by the snap.
+   */
+  #snapSignMessage(message: `metamask:${string}`): Promise<string> {
+    return this.messagingSystem.call(
+      'SnapController:handleRequest',
+      createSnapSignMessageRequest(message),
+    ) as Promise<string>;
+  }
+}
diff --git a/app/scripts/controllers/authentication/mocks/mockServices.ts b/app/scripts/controllers/authentication/mocks/mockServices.ts
new file mode 100644
index 000000000000..5db1690517dd
--- /dev/null
+++ b/app/scripts/controllers/authentication/mocks/mockServices.ts
@@ -0,0 +1,62 @@
+import nock from 'nock';
+import {
+  AUTH_LOGIN_ENDPOINT,
+  AUTH_NONCE_ENDPOINT,
+  LoginResponse,
+  NonceResponse,
+  OAuthTokenResponse,
+  OIDC_TOKENS_ENDPOINT,
+} from '../services';
+
+type MockReply = {
+  status: nock.StatusCode;
+  body?: nock.Body;
+};
+
+export const MOCK_NONCE = '4cbfqzoQpcNxVImGv';
+const MOCK_NONCE_RESPONSE: NonceResponse = {
+  nonce: MOCK_NONCE,
+};
+export function mockEndpointGetNonce(mockReply?: MockReply) {
+  const reply = mockReply ?? { status: 200, body: MOCK_NONCE_RESPONSE };
+  const mockNonceEndpoint = nock(AUTH_NONCE_ENDPOINT)
+    .get('')
+    .query(true)
+    .reply(reply.status, reply.body);
+
+  return mockNonceEndpoint;
+}
+
+export const MOCK_JWT =
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c';
+export const MOCK_LOGIN_RESPONSE: LoginResponse = {
+  token: MOCK_JWT,
+  expires_in: new Date().toString(),
+  profile: {
+    identifier_id: 'MOCK_IDENTIFIER',
+    profile_id: 'MOCK_PROFILE_ID',
+    metametrics_id: 'MOCK_METAMETRICS_ID',
+  },
+};
+export function mockEndpointLogin(mockReply?: MockReply) {
+  const reply = mockReply ?? { status: 200, body: MOCK_LOGIN_RESPONSE };
+  const mockLoginEndpoint = nock(AUTH_LOGIN_ENDPOINT)
+    .post('')
+    .reply(reply.status, reply.body);
+
+  return mockLoginEndpoint;
+}
+
+export const MOCK_ACCESS_TOKEN = `MOCK_ACCESS_TOKEN-${MOCK_JWT}`;
+const MOCK_OATH_TOKEN_RESPONSE: OAuthTokenResponse = {
+  access_token: MOCK_ACCESS_TOKEN,
+  expires_in: new Date().getTime(),
+};
+export function mockEndpointAccessToken(mockReply?: MockReply) {
+  const reply = mockReply ?? { status: 200, body: MOCK_OATH_TOKEN_RESPONSE };
+  const mockOidcTokensEndpoint = nock(OIDC_TOKENS_ENDPOINT)
+    .post('')
+    .reply(reply.status, reply.body);
+
+  return mockOidcTokensEndpoint;
+}
diff --git a/app/scripts/controllers/authentication/services.test.ts b/app/scripts/controllers/authentication/services.test.ts
new file mode 100644
index 000000000000..4806eb4159a1
--- /dev/null
+++ b/app/scripts/controllers/authentication/services.test.ts
@@ -0,0 +1,100 @@
+import {
+  MOCK_ACCESS_TOKEN,
+  MOCK_JWT,
+  MOCK_NONCE,
+  mockEndpointAccessToken,
+  mockEndpointGetNonce,
+  mockEndpointLogin,
+} from './mocks/mockServices';
+import {
+  createLoginRawMessage,
+  getAccessToken,
+  getNonce,
+  login,
+} from './services';
+
+describe('authentication/services.ts - getNonce() tests', () => {
+  test('returns nonce on valid request', async () => {
+    const mockNonceEndpoint = mockEndpointGetNonce();
+    const response = await getNonce('MOCK_PUBLIC_KEY');
+
+    mockNonceEndpoint.done();
+    expect(response).toBe(MOCK_NONCE);
+  });
+
+  test('returns null if request is invalid', async () => {
+    async function testInvalidResponse(
+      status: number,
+      body: Record<string, unknown>,
+    ) {
+      const mockNonceEndpoint = mockEndpointGetNonce({ status, body });
+      const response = await getNonce('MOCK_PUBLIC_KEY');
+
+      mockNonceEndpoint.done();
+      expect(response).toBe(null);
+    }
+
+    await testInvalidResponse(500, { error: 'mock server error' });
+    await testInvalidResponse(400, { error: 'mock bad request' });
+  });
+});
+
+describe('authentication/services.ts - login() tests', () => {
+  test('returns single-use jwt if successful login', async () => {
+    const mockLoginEndpoint = mockEndpointLogin();
+    const response = await login('mock raw message', 'mock signature');
+
+    mockLoginEndpoint.done();
+    expect(response?.token).toBe(MOCK_JWT);
+    expect(response?.profile).toBeDefined();
+  });
+
+  test('returns null if request is invalid', async () => {
+    async function testInvalidResponse(
+      status: number,
+      body: Record<string, unknown>,
+    ) {
+      const mockLoginEndpoint = mockEndpointLogin({ status, body });
+      const response = await login('mock raw message', 'mock signature');
+
+      mockLoginEndpoint.done();
+      expect(response).toBe(null);
+    }
+
+    await testInvalidResponse(500, { error: 'mock server error' });
+    await testInvalidResponse(400, { error: 'mock bad request' });
+  });
+});
+
+describe('authentication/services.ts - getAccessToken() tests', () => {
+  test('returns access token jwt if successful OIDC token request', async () => {
+    const mockLoginEndpoint = mockEndpointAccessToken();
+    const response = await getAccessToken('mock single-use jwt');
+
+    mockLoginEndpoint.done();
+    expect(response).toBe(MOCK_ACCESS_TOKEN);
+  });
+
+  test('returns null if request is invalid', async () => {
+    async function testInvalidResponse(
+      status: number,
+      body: Record<string, unknown>,
+    ) {
+      const mockLoginEndpoint = mockEndpointAccessToken({ status, body });
+      const response = await getAccessToken('mock single-use jwt');
+
+      mockLoginEndpoint.done();
+      expect(response).toBe(null);
+    }
+
+    await testInvalidResponse(500, { error: 'mock server error' });
+    await testInvalidResponse(400, { error: 'mock bad request' });
+  });
+});
+
+describe('authentication/services.ts - createLoginRawMessage() tests', () => {
+  test('creates the raw message format for login request', () => {
+    const message = createLoginRawMessage('NONCE', 'PUBLIC_KEY');
+    expect(message).toBe('metamask:NONCE:PUBLIC_KEY');
+  });
+});
diff --git a/app/scripts/controllers/authentication/services.ts b/app/scripts/controllers/authentication/services.ts
new file mode 100644
index 000000000000..345302e905cd
--- /dev/null
+++ b/app/scripts/controllers/authentication/services.ts
@@ -0,0 +1,116 @@
+const AUTH_ENDPOINT = process.env.AUTH_API || '';
+export const AUTH_NONCE_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/nonce`;
+export const AUTH_LOGIN_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/srp/login`;
+
+const OIDC_ENDPOINT = process.env.OIDC_API || '';
+export const OIDC_TOKENS_ENDPOINT = `${OIDC_ENDPOINT}/oauth2/token`;
+const OIDC_CLIENT_ID = process.env.OIDC_CLIENT_ID || '';
+const OIDC_GRANT_TYPE = process.env.OIDC_GRANT_TYPE || '';
+
+export type NonceResponse = {
+  nonce: string;
+};
+export async function getNonce(publicKey: string): Promise<string | null> {
+  const nonceUrl = new URL(AUTH_NONCE_ENDPOINT);
+  nonceUrl.searchParams.set('identifier', publicKey);
+
+  try {
+    const nonceResponse = await fetch(nonceUrl.toString());
+    if (!nonceResponse.ok) {
+      return null;
+    }
+
+    const nonceJson: NonceResponse = await nonceResponse.json();
+    return nonceJson?.nonce ?? null;
+  } catch (e) {
+    console.error('authentication-controller/services: unable to get nonce', e);
+    return null;
+  }
+}
+
+export type LoginResponse = {
+  token: string;
+  expires_in: string;
+  /**
+   * Contains anonymous information about the logged in profile.
+   *
+   * @property identifier_id - a deterministic unique identifier on the method used to sign in
+   * @property profile_id - a unique id for a given profile
+   * @property metametrics_id - an anonymous server id
+   */
+  profile: {
+    identifier_id: string;
+    profile_id: string;
+    metametrics_id: string;
+  };
+};
+export async function login(
+  rawMessage: string,
+  signature: string,
+): Promise<LoginResponse | null> {
+  try {
+    const response = await fetch(AUTH_LOGIN_ENDPOINT, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        signature,
+        raw_message: rawMessage,
+      }),
+    });
+
+    if (!response.ok) {
+      return null;
+    }
+
+    const loginResponse: LoginResponse = await response.json();
+    return loginResponse ?? null;
+  } catch (e) {
+    console.error('authentication-controller/services: unable to login', e);
+    return null;
+  }
+}
+
+export type OAuthTokenResponse = {
+  access_token: string;
+  expires_in: number;
+};
+export async function getAccessToken(jwtToken: string): Promise<string | null> {
+  const headers = new Headers({
+    'Content-Type': 'application/x-www-form-urlencoded',
+  });
+
+  const urlEncodedBody = new URLSearchParams();
+  urlEncodedBody.append('grant_type', OIDC_GRANT_TYPE);
+  urlEncodedBody.append('client_id', OIDC_CLIENT_ID);
+  urlEncodedBody.append('assertion', jwtToken);
+
+  try {
+    const response = await fetch(OIDC_TOKENS_ENDPOINT, {
+      method: 'POST',
+      headers,
+      body: urlEncodedBody.toString(),
+    });
+
+    if (!response.ok) {
+      return null;
+    }
+
+    const accessTokenResponse: OAuthTokenResponse = await response.json();
+    return accessTokenResponse?.access_token ?? null;
+  } catch (e) {
+    console.error(
+      'authentication-controller/services: unable to get access token',
+      e,
+    );
+    return null;
+  }
+}
+
+export function createLoginRawMessage(
+  nonce: string,
+  publicKey: string,
+): `metamask:${string}:${string}` {
+  return `metamask:${nonce}:${publicKey}` as const;
+}
diff --git a/app/scripts/controllers/decrypt-message.test.ts b/app/scripts/controllers/decrypt-message.test.ts
index a1cb0a58f037..848fe3f9986d 100644
--- a/app/scripts/controllers/decrypt-message.test.ts
+++ b/app/scripts/controllers/decrypt-message.test.ts
@@ -38,6 +38,8 @@ const createMessengerMock = () =>
     registerInitialEventPayload: jest.fn(),
     publish: jest.fn(),
     call: jest.fn(),
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any as jest.Mocked<DecryptMessageControllerMessenger>);
 
 const createDecryptMessageManagerMock = <T>() =>
@@ -57,6 +59,8 @@ const createDecryptMessageManagerMock = <T>() =>
     hub: {
       on: jest.fn(),
     },
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any as jest.Mocked<T>);
 
 describe('DecryptMessageController', () => {
@@ -81,6 +85,8 @@ describe('DecryptMessageController', () => {
 
   const mockMessengerAction = (
     action: string,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callback: (actionName: string, ...args: any[]) => any,
   ) => {
     messengerMock.call.mockImplementation((actionName, ...rest) => {
@@ -100,9 +106,17 @@ describe('DecryptMessageController', () => {
     );
 
     decryptMessageController = new MockDecryptMessageController({
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getState: getStateMock as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       keyringController: keyringControllerMock as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       messenger: messengerMock as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       metricsEvent: metricsEventMock as any,
     } as DecryptMessageControllerOptions);
   });
@@ -116,6 +130,8 @@ describe('DecryptMessageController', () => {
     decryptMessageController.update(() => ({
       unapprovedDecryptMsgs: {
         [messageIdMock]: messageMock,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any,
       unapprovedDecryptMsgCount: 1,
     }));
@@ -131,6 +147,8 @@ describe('DecryptMessageController', () => {
   it('should add unapproved messages', async () => {
     await decryptMessageController.newRequestDecryptMessage(
       messageMock,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       undefined as any,
     );
 
@@ -220,6 +238,8 @@ describe('DecryptMessageController', () => {
     const messageToDecrypt = {
       ...messageMock,
       data: messageDataMock,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any;
     decryptMessageManagerMock.getMessage.mockReturnValue(messageToDecrypt);
     mockMessengerAction(
@@ -271,6 +291,8 @@ describe('DecryptMessageController', () => {
   it('should be able to reject all unapproved messages', async () => {
     decryptMessageManagerMock.getUnapprovedMessages.mockReturnValue({
       [messageIdMock]: messageMock,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any);
 
     await decryptMessageController.rejectUnapproved('reason to cancel');
diff --git a/app/scripts/controllers/decrypt-message.ts b/app/scripts/controllers/decrypt-message.ts
index 5dbb4d8b43c6..51bf9c4b1250 100644
--- a/app/scripts/controllers/decrypt-message.ts
+++ b/app/scripts/controllers/decrypt-message.ts
@@ -117,8 +117,12 @@ export type DecryptMessageControllerMessenger = RestrictedControllerMessenger<
 >;
 
 export type DecryptMessageControllerOptions = {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getState: () => any;
   messenger: DecryptMessageControllerMessenger;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metricsEvent: (payload: any, options?: any) => void;
 };
 
@@ -132,8 +136,12 @@ export default class DecryptMessageController extends BaseController<
 > {
   hub: EventEmitter;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private _getState: () => any;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private _metricsEvent: (payload: any, options?: any) => void;
 
   private _decryptMessageManager: DecryptMessageManager;
@@ -363,6 +371,8 @@ export default class DecryptMessageController extends BaseController<
   ) {
     messageManager.subscribe((state: MessageManagerState<AbstractMessage>) => {
       const newMessages = this._migrateMessages(
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         state.unapprovedMessages as any,
       );
       this.update((draftState) => {
diff --git a/app/scripts/controllers/encryption-public-key.test.ts b/app/scripts/controllers/encryption-public-key.test.ts
index c36418abffb1..274f0c67d7e9 100644
--- a/app/scripts/controllers/encryption-public-key.test.ts
+++ b/app/scripts/controllers/encryption-public-key.test.ts
@@ -34,6 +34,8 @@ const messageMock = {
   status: 'unapproved',
   type: 'testType',
   rawSig: undefined,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any as AbstractMessage;
 
 const coreMessageMock = {
@@ -56,6 +58,8 @@ const createMessengerMock = () =>
     registerActionHandler: jest.fn(),
     publish: jest.fn(),
     call: jest.fn(),
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any as jest.Mocked<EncryptionPublicKeyControllerMessenger>);
 
 const createEncryptionPublicKeyManagerMock = <T>() =>
@@ -71,6 +75,8 @@ const createEncryptionPublicKeyManagerMock = <T>() =>
     hub: {
       on: jest.fn(),
     },
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any as jest.Mocked<T>);
 
 describe('EncryptionPublicKeyController', () => {
@@ -96,10 +102,20 @@ describe('EncryptionPublicKeyController', () => {
     );
 
     encryptionPublicKeyController = new EncryptionPublicKeyController({
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       messenger: messengerMock as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getEncryptionPublicKey: getEncryptionPublicKeyMock as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getAccountKeyringType: getAccountKeyringTypeMock as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getState: getStateMock as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       metricsEvent: metricsEventMock as any,
     } as EncryptionPublicKeyControllerOptions);
   });
@@ -120,6 +136,8 @@ describe('EncryptionPublicKeyController', () => {
       encryptionPublicKeyController.update(() => ({
         unapprovedEncryptionPublicKeyMsgs: {
           [messageIdMock]: messageMock,
+          // TODO: Replace `any` with type
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
         } as any,
         unapprovedEncryptionPublicKeyMsgCount: 1,
       }));
@@ -140,11 +158,15 @@ describe('EncryptionPublicKeyController', () => {
         [messageIdMock2]: messageMock,
       };
       encryptionPublicKeyManagerMock.getUnapprovedMessages.mockReturnValueOnce(
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         messages as any,
       );
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       encryptionPublicKeyController.update(() => ({
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         unapprovedEncryptionPublicKeyMsgs: messages as any,
       }));
     });
@@ -353,6 +375,8 @@ describe('EncryptionPublicKeyController', () => {
       const mockListener = jest.fn();
 
       encryptionPublicKeyController.hub.on('updateBadge', mockListener);
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (encryptionPublicKeyManagerMock.hub.on as any).mock.calls[0][1]();
 
       expect(mockListener).toHaveBeenCalledTimes(1);
@@ -361,6 +385,8 @@ describe('EncryptionPublicKeyController', () => {
     it('requires approval on unapproved message event from EncryptionPublicKeyManager', () => {
       messengerMock.call.mockResolvedValueOnce({});
 
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (encryptionPublicKeyManagerMock.hub.on as any).mock.calls[1][1](
         messageParamsMock,
       );
@@ -379,12 +405,16 @@ describe('EncryptionPublicKeyController', () => {
 
     it('updates state on EncryptionPublicKeyManager state change', async () => {
       await encryptionPublicKeyManagerMock.subscribe.mock.calls[0][0]({
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         unapprovedMessages: { [messageIdMock]: coreMessageMock as any },
         unapprovedMessagesCount: 3,
       });
 
       expect(encryptionPublicKeyController.state).toEqual({
         unapprovedEncryptionPublicKeyMsgs: {
+          // TODO: Replace `any` with type
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           [messageIdMock]: stateMessageMock as any,
         },
         unapprovedEncryptionPublicKeyMsgCount: 3,
diff --git a/app/scripts/controllers/encryption-public-key.ts b/app/scripts/controllers/encryption-public-key.ts
index 4bb019a10b72..2864bab34600 100644
--- a/app/scripts/controllers/encryption-public-key.ts
+++ b/app/scripts/controllers/encryption-public-key.ts
@@ -87,7 +87,11 @@ export type EncryptionPublicKeyControllerOptions = {
   messenger: EncryptionPublicKeyControllerMessenger;
   getEncryptionPublicKey: (address: string) => Promise<string>;
   getAccountKeyringType: (account: string) => Promise<string>;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getState: () => any;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metricsEvent: (payload: any, options?: any) => void;
 };
 
@@ -105,10 +109,14 @@ export default class EncryptionPublicKeyController extends BaseController<
 
   private _getAccountKeyringType: (account: string) => Promise<string>;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private _getState: () => any;
 
   private _encryptionPublicKeyManager: EncryptionPublicKeyManager;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private _metricsEvent: (payload: any, options?: any) => void;
 
   /**
@@ -352,6 +360,8 @@ export default class EncryptionPublicKeyController extends BaseController<
   ) {
     messageManager.subscribe((state: MessageManagerState<AbstractMessage>) => {
       const newMessages = this._migrateMessages(
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         state.unapprovedMessages as any,
       );
       this.update((draftState) => {
diff --git a/app/scripts/controllers/metamask-notifications/constants/constants.ts b/app/scripts/controllers/metamask-notifications/constants/constants.ts
new file mode 100644
index 000000000000..516b63b96fe3
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/constants/constants.ts
@@ -0,0 +1,4 @@
+export const USER_STORAGE_VERSION = '1';
+
+// Force cast. We don't really care about the type here since we treat it as a unique symbol
+export const USER_STORAGE_VERSION_KEY: unique symbol = 'v' as never;
diff --git a/app/scripts/controllers/metamask-notifications/constants/notification-schema.ts b/app/scripts/controllers/metamask-notifications/constants/notification-schema.ts
new file mode 100644
index 000000000000..77b791f3a5a8
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/constants/notification-schema.ts
@@ -0,0 +1,162 @@
+export enum TRIGGER_TYPES {
+  FEATURES_ANNOUNCEMENT = 'features_announcement',
+  METAMASK_SWAP_COMPLETED = 'metamask_swap_completed',
+  ERC20_SENT = 'erc20_sent',
+  ERC20_RECEIVED = 'erc20_received',
+  ETH_SENT = 'eth_sent',
+  ETH_RECEIVED = 'eth_received',
+  ROCKETPOOL_STAKE_COMPLETED = 'rocketpool_stake_completed',
+  ROCKETPOOL_UNSTAKE_COMPLETED = 'rocketpool_unstake_completed',
+  LIDO_STAKE_COMPLETED = 'lido_stake_completed',
+  LIDO_WITHDRAWAL_REQUESTED = 'lido_withdrawal_requested',
+  LIDO_WITHDRAWAL_COMPLETED = 'lido_withdrawal_completed',
+  LIDO_STAKE_READY_TO_BE_WITHDRAWN = 'lido_stake_ready_to_be_withdrawn',
+  ERC721_SENT = 'erc721_sent',
+  ERC721_RECEIVED = 'erc721_received',
+  ERC1155_SENT = 'erc1155_sent',
+  ERC1155_RECEIVED = 'erc1155_received',
+}
+
+export enum TRIGGER_TYPES_GROUPS {
+  RECEIVED = 'received',
+  SENT = 'sent',
+  DEFI = 'defi',
+}
+
+export const NOTIFICATION_CHAINS = {
+  ETHEREUM: '1',
+  OPTIMISM: '10',
+  BSC: '56',
+  POLYGON: '137',
+  ARBITRUM: '42161',
+  AVALANCHE: '43114',
+  LINEA: '59144',
+};
+
+export const CHAIN_SYMBOLS = {
+  [NOTIFICATION_CHAINS.ETHEREUM]: 'ETH',
+  [NOTIFICATION_CHAINS.OPTIMISM]: 'ETH',
+  [NOTIFICATION_CHAINS.BSC]: 'BNB',
+  [NOTIFICATION_CHAINS.POLYGON]: 'MATIC',
+  [NOTIFICATION_CHAINS.ARBITRUM]: 'ETH',
+  [NOTIFICATION_CHAINS.AVALANCHE]: 'AVAX',
+  [NOTIFICATION_CHAINS.LINEA]: 'ETH',
+};
+
+export const SUPPORTED_CHAINS = [
+  NOTIFICATION_CHAINS.ETHEREUM,
+  NOTIFICATION_CHAINS.OPTIMISM,
+  NOTIFICATION_CHAINS.BSC,
+  NOTIFICATION_CHAINS.POLYGON,
+  NOTIFICATION_CHAINS.ARBITRUM,
+  NOTIFICATION_CHAINS.AVALANCHE,
+  NOTIFICATION_CHAINS.LINEA,
+];
+
+export type Trigger = {
+  supported_chains: (typeof SUPPORTED_CHAINS)[number][];
+};
+
+type OnChainTriggerTypes = Exclude<
+  TRIGGER_TYPES,
+  TRIGGER_TYPES.FEATURES_ANNOUNCEMENT
+>;
+
+export const TRIGGERS: Record<OnChainTriggerTypes, Trigger> = {
+  [TRIGGER_TYPES.METAMASK_SWAP_COMPLETED]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.OPTIMISM,
+      NOTIFICATION_CHAINS.BSC,
+      NOTIFICATION_CHAINS.POLYGON,
+      NOTIFICATION_CHAINS.ARBITRUM,
+      NOTIFICATION_CHAINS.AVALANCHE,
+    ],
+  },
+  [TRIGGER_TYPES.ERC20_SENT]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.OPTIMISM,
+      NOTIFICATION_CHAINS.BSC,
+      NOTIFICATION_CHAINS.POLYGON,
+      NOTIFICATION_CHAINS.ARBITRUM,
+      NOTIFICATION_CHAINS.AVALANCHE,
+      NOTIFICATION_CHAINS.LINEA,
+    ],
+  },
+  [TRIGGER_TYPES.ERC20_RECEIVED]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.OPTIMISM,
+      NOTIFICATION_CHAINS.BSC,
+      NOTIFICATION_CHAINS.POLYGON,
+      NOTIFICATION_CHAINS.ARBITRUM,
+      NOTIFICATION_CHAINS.AVALANCHE,
+      NOTIFICATION_CHAINS.LINEA,
+    ],
+  },
+  [TRIGGER_TYPES.ERC721_SENT]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.POLYGON,
+    ],
+  },
+  [TRIGGER_TYPES.ERC721_RECEIVED]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.POLYGON,
+    ],
+  },
+  [TRIGGER_TYPES.ERC1155_SENT]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.POLYGON,
+    ],
+  },
+  [TRIGGER_TYPES.ERC1155_RECEIVED]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.POLYGON,
+    ],
+  },
+  [TRIGGER_TYPES.ETH_SENT]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.OPTIMISM,
+      NOTIFICATION_CHAINS.BSC,
+      NOTIFICATION_CHAINS.POLYGON,
+      NOTIFICATION_CHAINS.ARBITRUM,
+      NOTIFICATION_CHAINS.AVALANCHE,
+      NOTIFICATION_CHAINS.LINEA,
+    ],
+  },
+  [TRIGGER_TYPES.ETH_RECEIVED]: {
+    supported_chains: [
+      NOTIFICATION_CHAINS.ETHEREUM,
+      NOTIFICATION_CHAINS.OPTIMISM,
+      NOTIFICATION_CHAINS.BSC,
+      NOTIFICATION_CHAINS.POLYGON,
+      NOTIFICATION_CHAINS.ARBITRUM,
+      NOTIFICATION_CHAINS.AVALANCHE,
+      NOTIFICATION_CHAINS.LINEA,
+    ],
+  },
+  [TRIGGER_TYPES.ROCKETPOOL_STAKE_COMPLETED]: {
+    supported_chains: [NOTIFICATION_CHAINS.ETHEREUM],
+  },
+  [TRIGGER_TYPES.ROCKETPOOL_UNSTAKE_COMPLETED]: {
+    supported_chains: [NOTIFICATION_CHAINS.ETHEREUM],
+  },
+  [TRIGGER_TYPES.LIDO_STAKE_COMPLETED]: {
+    supported_chains: [NOTIFICATION_CHAINS.ETHEREUM],
+  },
+  [TRIGGER_TYPES.LIDO_WITHDRAWAL_REQUESTED]: {
+    supported_chains: [NOTIFICATION_CHAINS.ETHEREUM],
+  },
+  [TRIGGER_TYPES.LIDO_WITHDRAWAL_COMPLETED]: {
+    supported_chains: [NOTIFICATION_CHAINS.ETHEREUM],
+  },
+  [TRIGGER_TYPES.LIDO_STAKE_READY_TO_BE_WITHDRAWN]: {
+    supported_chains: [NOTIFICATION_CHAINS.ETHEREUM],
+  },
+};
diff --git a/app/scripts/controllers/metamask-notifications/metamask-notifications.test.ts b/app/scripts/controllers/metamask-notifications/metamask-notifications.test.ts
new file mode 100644
index 000000000000..4343f55ff7ef
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/metamask-notifications.test.ts
@@ -0,0 +1,762 @@
+import { ControllerMessenger } from '@metamask/base-controller';
+import * as ControllerUtils from '@metamask/controller-utils';
+import {
+  KeyringControllerGetAccountsAction,
+  KeyringControllerState,
+  KeyringControllerStateChangeEvent,
+} from '@metamask/keyring-controller';
+import {
+  AuthenticationControllerGetBearerToken,
+  AuthenticationControllerIsSignedIn,
+} from '../authentication/authentication-controller';
+import { MOCK_ACCESS_TOKEN } from '../authentication/mocks/mockServices';
+import {
+  UserStorageControllerGetStorageKey,
+  UserStorageControllerPerformGetStorage,
+  UserStorageControllerPerformSetStorage,
+} from '../user-storage/user-storage-controller';
+import {
+  AllowedActions,
+  AllowedEvents,
+  MetamaskNotificationsController,
+  PushNotificationsControllerDisablePushNotifications,
+  PushNotificationsControllerEnablePushNotifications,
+  PushNotificationsControllerUpdateTriggerPushNotifications,
+  defaultState,
+} from './metamask-notifications';
+import {
+  createMockFeatureAnnouncementAPIResult,
+  createMockFeatureAnnouncementRaw,
+  mockFetchFeatureAnnouncementNotifications,
+} from './mocks/mock-feature-announcements';
+import {
+  MOCK_USER_STORAGE_ACCOUNT,
+  createMockFullUserStorage,
+  createMockUserStorageWithTriggers,
+} from './mocks/mock-notification-user-storage';
+import {
+  mockBatchCreateTriggers,
+  mockBatchDeleteTriggers,
+  mockListNotifications,
+  mockMarkNotificationsAsRead,
+} from './mocks/mock-onchain-notifications';
+import { createMockNotificationEthSent } from './mocks/mock-raw-notifications';
+import { processNotification } from './processors/process-notifications';
+import * as OnChainNotifications from './services/onchain-notifications';
+import { UserStorage } from './types/user-storage/user-storage';
+import * as MetamaskNotificationsUtils from './utils/utils';
+
+describe('metamask-notifications - constructor()', () => {
+  test('initializes state & override state', () => {
+    const controller1 = new MetamaskNotificationsController({
+      messenger: mockNotificationMessenger().messenger,
+    });
+    expect(controller1.state).toEqual(defaultState);
+
+    const controller2 = new MetamaskNotificationsController({
+      messenger: mockNotificationMessenger().messenger,
+      state: {
+        ...defaultState,
+        isFeatureAnnouncementsEnabled: true,
+        isMetamaskNotificationsEnabled: true,
+      },
+    });
+    expect(controller2.state.isFeatureAnnouncementsEnabled).toBe(true);
+    expect(controller2.state.isMetamaskNotificationsEnabled).toBe(true);
+  });
+
+  test('Keyring Change Event but feature not enabled will not add or remove triggers', async () => {
+    const { messenger, globalMessenger, mockListAccounts } = arrangeMocks();
+
+    // initialize controller with 1 address
+    mockListAccounts.mockResolvedValueOnce(['addr1']);
+    const controller = new MetamaskNotificationsController({ messenger });
+
+    const mockUpdate = jest
+      .spyOn(controller, 'updateOnChainTriggersByAccount')
+      .mockResolvedValue({} as UserStorage);
+    const mockDelete = jest
+      .spyOn(controller, 'deleteOnChainTriggersByAccount')
+      .mockResolvedValue({} as UserStorage);
+
+    // listAccounts has a new address
+    mockListAccounts.mockResolvedValueOnce(['addr1', 'addr2']);
+    await actPublishKeyringStateChange(globalMessenger);
+
+    expect(mockUpdate).not.toBeCalled();
+    expect(mockDelete).not.toBeCalled();
+  });
+
+  test('Keying Change Event with new triggers', async () => {
+    const { messenger, globalMessenger, mockListAccounts } = arrangeMocks();
+
+    // initialize controller with 1 address
+    mockListAccounts.mockResolvedValueOnce(['addr1']);
+    const controller = new MetamaskNotificationsController({ messenger });
+    controller.state.isMetamaskNotificationsEnabled = true;
+
+    const mockUpdate = jest
+      .spyOn(controller, 'updateOnChainTriggersByAccount')
+      .mockResolvedValue({} as UserStorage);
+    const mockDelete = jest
+      .spyOn(controller, 'deleteOnChainTriggersByAccount')
+      .mockResolvedValue({} as UserStorage);
+
+    async function act(
+      addresses: string[],
+      assertion: () => Promise<void> | void,
+    ) {
+      mockListAccounts.mockResolvedValueOnce(addresses);
+      await actPublishKeyringStateChange(globalMessenger);
+      await assertion();
+
+      // Clear mocks for next act/assert
+      mockUpdate.mockClear();
+      mockDelete.mockClear();
+    }
+
+    await act(['addr2'], () => {
+      expect(mockUpdate).toBeCalled();
+      expect(mockDelete).toBeCalled();
+    });
+
+    // Act - new accounts were added
+    await act(['addr1', 'addr2'], () => {
+      expect(mockUpdate).toBeCalled();
+      expect(mockDelete).not.toBeCalled();
+    });
+
+    // Act - an account was removed
+    await act(['addr1'], () => {
+      expect(mockUpdate).not.toBeCalled();
+      expect(mockDelete).toBeCalled();
+    });
+
+    // Act - an account was added and removed
+    await act(['addr2'], () => {
+      expect(mockUpdate).toBeCalled();
+      expect(mockDelete).toBeCalled();
+    });
+  });
+
+  function arrangeMocks() {
+    const messengerMocks = mockNotificationMessenger();
+    jest
+      .spyOn(ControllerUtils, 'toChecksumHexAddress')
+      .mockImplementation((x) => x);
+
+    return messengerMocks;
+  }
+
+  async function actPublishKeyringStateChange(
+    messenger: ControllerMessenger<never, KeyringControllerStateChangeEvent>,
+  ) {
+    await messenger.publish(
+      'KeyringController:stateChange',
+      {} as KeyringControllerState,
+      [],
+    );
+  }
+});
+
+// See /utils for more in-depth testing
+describe('metamask-notifications - checkAccountsPresence()', () => {
+  test('Returns Record with accounts that have notifications enabled', async () => {
+    const { messenger, mockPerformGetStorage } = mockNotificationMessenger();
+    mockPerformGetStorage.mockResolvedValue(
+      JSON.stringify(createMockFullUserStorage()),
+    );
+
+    const controller = new MetamaskNotificationsController({ messenger });
+    const result = await controller.checkAccountsPresence([
+      MOCK_USER_STORAGE_ACCOUNT,
+      'fake_account',
+    ]);
+    expect(result).toEqual({
+      [MOCK_USER_STORAGE_ACCOUNT]: true,
+      fake_account: false,
+    });
+  });
+});
+
+describe('metamask-notifications - setMetamaskNotificationsEnabled()', () => {
+  test('flips enabled state', async () => {
+    const { messenger, mockIsSignedIn } = mockNotificationMessenger();
+    mockIsSignedIn.mockReturnValue(true);
+
+    const controller = new MetamaskNotificationsController({
+      messenger,
+      state: { ...defaultState, isMetamaskNotificationsEnabled: false },
+    });
+
+    await controller.setMetamaskNotificationsEnabled(true);
+
+    expect(controller.state.isMetamaskNotificationsEnabled).toBe(true);
+  });
+});
+
+describe('metamask-notifications - setMetamaskNotificationsFeatureSeen()', () => {
+  test('flips state when the method is called', async () => {
+    const { messenger, mockIsSignedIn } = mockNotificationMessenger();
+    mockIsSignedIn.mockReturnValue(true);
+
+    const controller = new MetamaskNotificationsController({
+      messenger,
+      state: { ...defaultState, isMetamaskNotificationsFeatureSeen: false },
+    });
+
+    await controller.setMetamaskNotificationsFeatureSeen();
+
+    expect(controller.state.isMetamaskNotificationsFeatureSeen).toBe(true);
+  });
+
+  test('does not update if auth is not enabled', async () => {
+    const { messenger, mockIsSignedIn } = mockNotificationMessenger();
+    mockIsSignedIn.mockReturnValue(false); // state is off.
+
+    const controller = new MetamaskNotificationsController({
+      messenger,
+      state: { ...defaultState, isMetamaskNotificationsFeatureSeen: false },
+    });
+
+    await expect(() =>
+      controller.setMetamaskNotificationsFeatureSeen(),
+    ).rejects.toThrow();
+
+    expect(controller.state.isMetamaskNotificationsFeatureSeen).toBe(false); // this flag was never flipped
+  });
+});
+
+describe('metamask-notifications - setFeatureAnnouncementsEnabled()', () => {
+  test('flips state when the method is called', async () => {
+    const { messenger, mockIsSignedIn } = mockNotificationMessenger();
+    mockIsSignedIn.mockReturnValue(true);
+
+    const controller = new MetamaskNotificationsController({
+      messenger,
+      state: { ...defaultState, isFeatureAnnouncementsEnabled: false },
+    });
+
+    await controller.setFeatureAnnouncementsEnabled(true);
+
+    expect(controller.state.isFeatureAnnouncementsEnabled).toBe(true);
+  });
+
+  test('does not update if auth is not enabled', async () => {
+    const { messenger, mockIsSignedIn } = mockNotificationMessenger();
+    mockIsSignedIn.mockReturnValue(false); // state is off.
+
+    const controller = new MetamaskNotificationsController({
+      messenger,
+      state: { ...defaultState, isFeatureAnnouncementsEnabled: false },
+    });
+
+    await expect(() =>
+      controller.setFeatureAnnouncementsEnabled(false),
+    ).rejects.toThrow();
+    expect(controller.state.isFeatureAnnouncementsEnabled).toBe(false); // this flag was never flipped
+  });
+});
+
+describe('metamask-notifications - setSnapNotificationsEnabled()', () => {
+  test('flips state when the method is called', async () => {
+    const { messenger, mockIsSignedIn } = mockNotificationMessenger();
+    mockIsSignedIn.mockReturnValue(true);
+
+    const controller = new MetamaskNotificationsController({
+      messenger,
+      state: { ...defaultState, isSnapNotificationsEnabled: false },
+    });
+
+    await controller.setSnapNotificationsEnabled(true);
+
+    expect(controller.state.isSnapNotificationsEnabled).toBe(true);
+  });
+
+  test('does not update if auth is not enabled', async () => {
+    const { messenger, mockIsSignedIn } = mockNotificationMessenger();
+    mockIsSignedIn.mockReturnValue(false); // state is off.
+
+    const controller = new MetamaskNotificationsController({
+      messenger,
+      state: { ...defaultState, isSnapNotificationsEnabled: false },
+    });
+
+    await controller.setSnapNotificationsEnabled(false);
+
+    expect(controller.state.isSnapNotificationsEnabled).toBe(false); // this flag was never flipped
+  });
+});
+
+describe('metamask-notifications - createOnChainTriggers()', () => {
+  test('(Re-Creates) triggers and updates push notification links if using an existing User Storage (login for existing user)', async () => {
+    const {
+      messenger,
+      mockInitializeUserStorage,
+      mockEnablePushNotifications,
+      mockCreateOnChainTriggers,
+    } = arrangeMocks();
+    const controller = new MetamaskNotificationsController({ messenger });
+
+    const result = await controller.createOnChainTriggers();
+    expect(result).toBeDefined();
+    expect(mockInitializeUserStorage).not.toBeCalled(); // not called since we don't need to initialize (this is an existing user)
+    expect(mockCreateOnChainTriggers).toBeCalled();
+    expect(mockEnablePushNotifications).toBeCalled();
+  });
+
+  test('Create new triggers and push notifications if there is no User Storage (login for new user)', async () => {
+    const {
+      messenger,
+      mockInitializeUserStorage,
+      mockEnablePushNotifications,
+      mockCreateOnChainTriggers,
+      mockPerformGetStorage,
+    } = arrangeMocks();
+    const controller = new MetamaskNotificationsController({ messenger });
+    mockPerformGetStorage.mockResolvedValue(null); // Mock no storage found.
+
+    const result = await controller.createOnChainTriggers();
+    expect(result).toBeDefined();
+    expect(mockInitializeUserStorage).toBeCalled(); // called since no user storage (this is an existing user)
+    expect(mockCreateOnChainTriggers).toBeCalled();
+    expect(mockEnablePushNotifications).toBeCalled();
+  });
+
+  test('Throws if not given a valid auth & storage key', async () => {
+    const mocks = arrangeMocks();
+    const controller = new MetamaskNotificationsController({
+      messenger: mocks.messenger,
+    });
+
+    const testScenarios = {
+      ...arrangeFailureAuthAssertions(mocks),
+      ...arrangeFailureUserStorageKeyAssertions(mocks),
+    };
+
+    for (const mockFailureAction of Object.values(testScenarios)) {
+      mockFailureAction();
+      await expect(controller.createOnChainTriggers()).rejects.toThrow();
+    }
+  });
+
+  function arrangeMocks() {
+    const messengerMocks = mockNotificationMessenger();
+    const mockCreateOnChainTriggers = jest
+      .spyOn(OnChainNotifications, 'createOnChainTriggers')
+      .mockResolvedValue();
+    const mockInitializeUserStorage = jest
+      .spyOn(MetamaskNotificationsUtils, 'initializeUserStorage')
+      .mockReturnValue(createMockUserStorageWithTriggers(['t1', 't2']));
+    return {
+      ...messengerMocks,
+      mockCreateOnChainTriggers,
+      mockInitializeUserStorage,
+    };
+  }
+});
+
+describe('metamask-notifications - deleteOnChainTriggersByAccount', () => {
+  test('Deletes and disables push notifications for a given account', async () => {
+    const {
+      messenger,
+      nockMockDeleteTriggersAPI,
+      mockDisablePushNotifications,
+    } = arrangeMocks();
+    const controller = new MetamaskNotificationsController({ messenger });
+    const result = await controller.deleteOnChainTriggersByAccount([
+      MOCK_USER_STORAGE_ACCOUNT,
+    ]);
+    expect(
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(result).length,
+    ).toBe(0);
+    expect(nockMockDeleteTriggersAPI.isDone()).toBe(true);
+    expect(mockDisablePushNotifications).toBeCalled();
+  });
+
+  test('Does nothing if account does not exist in storage', async () => {
+    const { messenger, mockDisablePushNotifications } = arrangeMocks();
+    const controller = new MetamaskNotificationsController({ messenger });
+    const result = await controller.deleteOnChainTriggersByAccount([
+      'UNKNOWN_ACCOUNT',
+    ]);
+    expect(
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(result).length,
+    ).not.toBe(0);
+
+    expect(mockDisablePushNotifications).not.toBeCalled();
+  });
+
+  test('Throws errors when invalid auth and storage', async () => {
+    const mocks = arrangeMocks();
+    const controller = new MetamaskNotificationsController({
+      messenger: mocks.messenger,
+    });
+
+    const testScenarios = {
+      ...arrangeFailureAuthAssertions(mocks),
+      ...arrangeFailureUserStorageKeyAssertions(mocks),
+      ...arrangeFailureUserStorageAssertions(mocks),
+    };
+
+    for (const mockFailureAction of Object.values(testScenarios)) {
+      mockFailureAction();
+      await expect(
+        controller.deleteOnChainTriggersByAccount([MOCK_USER_STORAGE_ACCOUNT]),
+      ).rejects.toThrow();
+    }
+  });
+
+  function arrangeMocks() {
+    const messengerMocks = mockNotificationMessenger();
+    const nockMockDeleteTriggersAPI = mockBatchDeleteTriggers();
+    return { ...messengerMocks, nockMockDeleteTriggersAPI };
+  }
+});
+
+describe('metamask-notifications - updateOnChainTriggersByAccount()', () => {
+  test('Creates Triggers and Push Notification Links for a new account', async () => {
+    const {
+      messenger,
+      mockUpdateTriggerPushNotifications,
+      mockPerformSetStorage,
+    } = arrangeMocks();
+    const MOCK_ACCOUNT = 'MOCK_ACCOUNT2';
+    const controller = new MetamaskNotificationsController({ messenger });
+
+    const result = await controller.updateOnChainTriggersByAccount([
+      MOCK_ACCOUNT,
+    ]);
+    expect(
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(result, {
+        address: MOCK_ACCOUNT.toLowerCase(),
+      }).length > 0,
+    ).toBe(true);
+
+    expect(mockUpdateTriggerPushNotifications).toBeCalled();
+    expect(mockPerformSetStorage).toBeCalled();
+  });
+
+  test('Throws errors when invalid auth and storage', async () => {
+    const mocks = arrangeMocks();
+    const controller = new MetamaskNotificationsController({
+      messenger: mocks.messenger,
+    });
+
+    const testScenarios = {
+      ...arrangeFailureAuthAssertions(mocks),
+      ...arrangeFailureUserStorageKeyAssertions(mocks),
+      ...arrangeFailureUserStorageAssertions(mocks),
+    };
+
+    for (const mockFailureAction of Object.values(testScenarios)) {
+      mockFailureAction();
+      await expect(
+        controller.deleteOnChainTriggersByAccount([MOCK_USER_STORAGE_ACCOUNT]),
+      ).rejects.toThrow();
+    }
+  });
+
+  function arrangeMocks() {
+    const messengerMocks = mockNotificationMessenger();
+    const mockBatchTriggersAPI = mockBatchCreateTriggers();
+    return { ...messengerMocks, mockBatchTriggersAPI };
+  }
+});
+
+describe('metamask-notifications - fetchAndUpdateMetamaskNotifications()', () => {
+  test('Processes and shows feature announcements and wallet notifications', async () => {
+    const {
+      messenger,
+      mockFeatureAnnouncementAPIResult,
+      mockListNotificationsAPIResult,
+    } = arrangeMocks();
+    const controller = new MetamaskNotificationsController({ messenger });
+
+    const result = await controller.fetchAndUpdateMetamaskNotifications();
+
+    // Should have 1 feature announcement and 1 wallet notification
+    expect(result.length).toBe(2);
+    expect(
+      result.find(
+        (n) => n.id === mockFeatureAnnouncementAPIResult.items?.[0].fields.id,
+      ),
+    ).toBeDefined();
+    expect(result.find((n) => n.id === mockListNotificationsAPIResult[0].id));
+
+    // State is also updated
+    expect(controller.state.metamaskNotificationsList.length).toBe(2);
+  });
+
+  test('Only fetches and processes feature announcements if not authenticated', async () => {
+    const { messenger, mockGetBearerToken, mockFeatureAnnouncementAPIResult } =
+      arrangeMocks();
+    mockGetBearerToken.mockRejectedValue(
+      new Error('MOCK - failed to get access token'),
+    );
+
+    const controller = new MetamaskNotificationsController({ messenger });
+
+    // Should only have feature announcement
+    const result = await controller.fetchAndUpdateMetamaskNotifications();
+    expect(result.length).toBe(1);
+    expect(
+      result.find(
+        (n) => n.id === mockFeatureAnnouncementAPIResult.items?.[0].fields.id,
+      ),
+    ).toBeDefined();
+
+    // State is also updated
+    expect(controller.state.metamaskNotificationsList.length).toBe(1);
+  });
+
+  function arrangeMocks() {
+    const messengerMocks = mockNotificationMessenger();
+
+    const mockFeatureAnnouncementAPIResult =
+      createMockFeatureAnnouncementAPIResult();
+    const mockFeatureAnnouncementsAPI =
+      mockFetchFeatureAnnouncementNotifications({
+        status: 200,
+        body: mockFeatureAnnouncementAPIResult,
+      });
+
+    const mockListNotificationsAPIResult = [createMockNotificationEthSent()];
+    const mockListNotificationsAPI = mockListNotifications({
+      status: 200,
+      body: mockListNotificationsAPIResult,
+    });
+    return {
+      ...messengerMocks,
+      mockFeatureAnnouncementAPIResult,
+      mockFeatureAnnouncementsAPI,
+      mockListNotificationsAPIResult,
+      mockListNotificationsAPI,
+    };
+  }
+});
+
+describe('metamask-notifications - markMetamaskNotificationsAsRead()', () => {
+  test('updates feature announcements and wallet notifications as read', async () => {
+    const { messenger } = arrangeMocks();
+    const controller = new MetamaskNotificationsController({ messenger });
+
+    await controller.markMetamaskNotificationsAsRead([
+      processNotification(createMockFeatureAnnouncementRaw()),
+      processNotification(createMockNotificationEthSent()),
+    ]);
+
+    // Should see 2 items in controller read state
+    expect(controller.state.metamaskNotificationsReadList.length).toBe(2);
+  });
+
+  test('should at least mark feature announcements locally if external updates fail', async () => {
+    const { messenger } = arrangeMocks({ onChainMarkAsReadFails: true });
+    const controller = new MetamaskNotificationsController({ messenger });
+
+    await controller.markMetamaskNotificationsAsRead([
+      processNotification(createMockFeatureAnnouncementRaw()),
+      processNotification(createMockNotificationEthSent()),
+    ]);
+
+    // Should see 1 item in controller read state.
+    // This is because on-chain failed.
+    // We can debate & change implementation if it makes sense to mark as read locally if external APIs fail.
+    expect(controller.state.metamaskNotificationsReadList.length).toBe(1);
+  });
+
+  function arrangeMocks(options?: { onChainMarkAsReadFails: boolean }) {
+    const messengerMocks = mockNotificationMessenger();
+
+    const mockMarkAsReadAPI = mockMarkNotificationsAsRead({
+      status: options?.onChainMarkAsReadFails ? 500 : 200,
+    });
+
+    return {
+      ...messengerMocks,
+      mockMarkAsReadAPI,
+    };
+  }
+});
+
+// Type-Computation - we are extracting args and parameters from a generic type utility
+// Thus this `AnyFunc` can be used to help constrain the generic parameters correctly
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type AnyFunc = (...args: any[]) => any;
+const typedMockAction = <Action extends { handler: AnyFunc }>() =>
+  jest.fn<ReturnType<Action['handler']>, Parameters<Action['handler']>>();
+
+function mockNotificationMessenger() {
+  const globalMessenger = new ControllerMessenger<
+    AllowedActions,
+    AllowedEvents
+  >();
+
+  const messenger = globalMessenger.getRestricted({
+    name: 'MetamaskNotificationsController',
+    allowedActions: [
+      'KeyringController:getAccounts',
+      'AuthenticationController:getBearerToken',
+      'AuthenticationController:isSignedIn',
+      'PushPlatformNotificationsController:disablePushNotifications',
+      'PushPlatformNotificationsController:enablePushNotifications',
+      'PushPlatformNotificationsController:updateTriggerPushNotifications',
+      'UserStorageController:getStorageKey',
+      'UserStorageController:performGetStorage',
+      'UserStorageController:performSetStorage',
+    ],
+    allowedEvents: ['KeyringController:stateChange'],
+  });
+
+  const mockListAccounts =
+    typedMockAction<KeyringControllerGetAccountsAction>().mockResolvedValue([]);
+
+  const mockGetBearerToken =
+    typedMockAction<AuthenticationControllerGetBearerToken>().mockResolvedValue(
+      MOCK_ACCESS_TOKEN,
+    );
+
+  const mockIsSignedIn =
+    typedMockAction<AuthenticationControllerIsSignedIn>().mockReturnValue(true);
+
+  const mockDisablePushNotifications =
+    typedMockAction<PushNotificationsControllerDisablePushNotifications>();
+
+  const mockEnablePushNotifications =
+    typedMockAction<PushNotificationsControllerEnablePushNotifications>();
+
+  const mockUpdateTriggerPushNotifications =
+    typedMockAction<PushNotificationsControllerUpdateTriggerPushNotifications>();
+
+  const mockGetStorageKey =
+    typedMockAction<UserStorageControllerGetStorageKey>().mockResolvedValue(
+      'MOCK_STORAGE_KEY',
+    );
+
+  const mockPerformGetStorage =
+    typedMockAction<UserStorageControllerPerformGetStorage>().mockResolvedValue(
+      JSON.stringify(createMockFullUserStorage()),
+    );
+
+  const mockPerformSetStorage =
+    typedMockAction<UserStorageControllerPerformSetStorage>();
+
+  jest.spyOn(messenger, 'call').mockImplementation((...args) => {
+    const [actionType] = args;
+
+    // This mock implementation does not have a nice discriminate union where types/parameters can be correctly inferred
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const [, ...params]: any[] = args;
+
+    if (actionType === 'KeyringController:getAccounts') {
+      return mockListAccounts();
+    }
+
+    if (actionType === 'AuthenticationController:getBearerToken') {
+      return mockGetBearerToken();
+    }
+
+    if (actionType === 'AuthenticationController:isSignedIn') {
+      return mockIsSignedIn();
+    }
+
+    if (
+      actionType ===
+      'PushPlatformNotificationsController:disablePushNotifications'
+    ) {
+      return mockDisablePushNotifications(params[0]);
+    }
+
+    if (
+      actionType ===
+      'PushPlatformNotificationsController:enablePushNotifications'
+    ) {
+      return mockEnablePushNotifications(params[0]);
+    }
+
+    if (
+      actionType ===
+      'PushPlatformNotificationsController:updateTriggerPushNotifications'
+    ) {
+      return mockUpdateTriggerPushNotifications(params[0]);
+    }
+
+    if (actionType === 'UserStorageController:getStorageKey') {
+      return mockGetStorageKey();
+    }
+
+    if (actionType === 'UserStorageController:performGetStorage') {
+      return mockPerformGetStorage(params[0]);
+    }
+
+    if (actionType === 'UserStorageController:performSetStorage') {
+      return mockPerformSetStorage(params[0], params[1]);
+    }
+
+    function exhaustedMessengerMocks(action: never) {
+      return new Error(`MOCK_FAIL - unsupported messenger call: ${action}`);
+    }
+    throw exhaustedMessengerMocks(actionType);
+  });
+
+  return {
+    globalMessenger,
+    messenger,
+    mockListAccounts,
+    mockGetBearerToken,
+    mockIsSignedIn,
+    mockDisablePushNotifications,
+    mockEnablePushNotifications,
+    mockUpdateTriggerPushNotifications,
+    mockGetStorageKey,
+    mockPerformGetStorage,
+    mockPerformSetStorage,
+  };
+}
+
+function arrangeFailureAuthAssertions(
+  mocks: ReturnType<typeof mockNotificationMessenger>,
+) {
+  const testScenarios = {
+    NotLoggedIn: () => mocks.mockIsSignedIn.mockReturnValue(false),
+
+    // unlikely, but in case it returns null
+    NoBearerToken: () =>
+      mocks.mockGetBearerToken.mockResolvedValueOnce(null as unknown as string),
+
+    RejectedBearerToken: () =>
+      mocks.mockGetBearerToken.mockRejectedValueOnce(
+        new Error('MOCK - no bearer token'),
+      ),
+  };
+
+  return testScenarios;
+}
+
+function arrangeFailureUserStorageKeyAssertions(
+  mocks: ReturnType<typeof mockNotificationMessenger>,
+) {
+  const testScenarios = {
+    NoStorageKey: () =>
+      mocks.mockGetStorageKey.mockResolvedValueOnce(null as unknown as string), // unlikely but in case it returns null
+    RejectedStorageKey: () =>
+      mocks.mockGetStorageKey.mockRejectedValueOnce(
+        new Error('MOCK - no storage key'),
+      ),
+  };
+  return testScenarios;
+}
+
+function arrangeFailureUserStorageAssertions(
+  mocks: ReturnType<typeof mockNotificationMessenger>,
+) {
+  const testScenarios = {
+    NoUserStorage: () =>
+      mocks.mockPerformGetStorage.mockResolvedValueOnce(null),
+    ThrowUserStorage: () =>
+      mocks.mockPerformGetStorage.mockRejectedValueOnce(
+        new Error('MOCK - Unable to call storage api'),
+      ),
+  };
+  return testScenarios;
+}
diff --git a/app/scripts/controllers/metamask-notifications/metamask-notifications.ts b/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
new file mode 100644
index 000000000000..2296fa4f9064
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
@@ -0,0 +1,841 @@
+import {
+  BaseController,
+  RestrictedControllerMessenger,
+  ControllerGetStateAction,
+  ControllerStateChangeEvent,
+  StateMetadata,
+} from '@metamask/base-controller';
+import log from 'loglevel';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import {
+  KeyringControllerGetAccountsAction,
+  KeyringControllerStateChangeEvent,
+} from '@metamask/keyring-controller';
+import {
+  AuthenticationControllerGetBearerToken,
+  AuthenticationControllerIsSignedIn,
+} from '../authentication/authentication-controller';
+import {
+  UserStorageControllerGetStorageKey,
+  UserStorageControllerPerformGetStorage,
+  UserStorageControllerPerformSetStorage,
+} from '../user-storage/user-storage-controller';
+import {
+  TRIGGER_TYPES,
+  TRIGGER_TYPES_GROUPS,
+} from './constants/notification-schema';
+import { USER_STORAGE_VERSION_KEY } from './constants/constants';
+import type { UserStorage } from './types/user-storage/user-storage';
+import * as FeatureNotifications from './services/feature-announcements';
+import * as OnChainNotifications from './services/onchain-notifications';
+import type {
+  Notification,
+  MarkAsReadNotificationsParam,
+} from './types/notification/notification';
+import { OnChainRawNotification } from './types/on-chain-notification/on-chain-notification';
+import { FeatureAnnouncementRawNotification } from './types/feature-announcement/feature-announcement';
+import { processNotification } from './processors/process-notifications';
+import * as MetamaskNotificationsUtils from './utils/utils';
+
+// Unique name for the controller
+const controllerName = 'MetamaskNotificationsController';
+
+/**
+ * State shape for MetamaskNotificationsController
+ */
+export type MetamaskNotificationsControllerState = {
+  /**
+   * Flag that indicates if the metamask notifications feature has been seen
+   */
+  isMetamaskNotificationsFeatureSeen: boolean;
+
+  /**
+   * Flag that indicates if the metamask notifications are enabled
+   */
+  isMetamaskNotificationsEnabled: boolean;
+
+  /**
+   * Flag that indicates if the feature announcements are enabled
+   */
+  isFeatureAnnouncementsEnabled: boolean;
+
+  /**
+   * Flag that indicates if the Snap notifications are enabled
+   */
+  isSnapNotificationsEnabled: boolean;
+
+  /**
+   * List of metamask notifications
+   */
+  metamaskNotificationsList: Notification[];
+
+  /**
+   * List of read metamask notifications
+   */
+  metamaskNotificationsReadList: string[];
+};
+
+const metadata: StateMetadata<MetamaskNotificationsControllerState> = {
+  isMetamaskNotificationsFeatureSeen: {
+    persist: true,
+    anonymous: false,
+  },
+  isMetamaskNotificationsEnabled: {
+    persist: true,
+    anonymous: false,
+  },
+  isFeatureAnnouncementsEnabled: {
+    persist: true,
+    anonymous: false,
+  },
+  isSnapNotificationsEnabled: {
+    persist: true,
+    anonymous: false,
+  },
+  metamaskNotificationsList: {
+    persist: true,
+    anonymous: true,
+  },
+  metamaskNotificationsReadList: {
+    persist: true,
+    anonymous: true,
+  },
+};
+export const defaultState: MetamaskNotificationsControllerState = {
+  isMetamaskNotificationsFeatureSeen: false,
+  isMetamaskNotificationsEnabled: false,
+  isFeatureAnnouncementsEnabled: false,
+  isSnapNotificationsEnabled: false,
+  metamaskNotificationsList: [],
+  metamaskNotificationsReadList: [],
+};
+
+// Mock Push Notification Controller Actions, added in a separate PR.
+export type PushNotificationsControllerEnablePushNotifications = {
+  type: 'PushPlatformNotificationsController:enablePushNotifications';
+  handler: (UUIDs: string[]) => Promise<void>;
+};
+export type PushNotificationsControllerDisablePushNotifications = {
+  type: 'PushPlatformNotificationsController:disablePushNotifications';
+  handler: (UUIDs: string[]) => Promise<void>;
+};
+export type PushNotificationsControllerUpdateTriggerPushNotifications = {
+  type: 'PushPlatformNotificationsController:updateTriggerPushNotifications';
+  handler: (UUIDs: string[]) => Promise<void>;
+};
+
+// Messenger Actions
+export type Actions = ControllerGetStateAction<
+  'state',
+  MetamaskNotificationsControllerState
+>;
+
+// Allowed Actions
+export type AllowedActions =
+  // Keyring Controller Requests
+  | KeyringControllerGetAccountsAction
+  // Auth Controller Requests
+  | AuthenticationControllerGetBearerToken
+  | AuthenticationControllerIsSignedIn
+  // User Storage Controller Requests
+  | UserStorageControllerGetStorageKey
+  | UserStorageControllerPerformGetStorage
+  | UserStorageControllerPerformSetStorage
+  // Push Notifications Controller Requests
+  | PushNotificationsControllerEnablePushNotifications
+  | PushNotificationsControllerDisablePushNotifications
+  | PushNotificationsControllerUpdateTriggerPushNotifications;
+
+// Events
+export type MetamaskNotificationsControllerMessengerEvents =
+  ControllerStateChangeEvent<
+    typeof controllerName,
+    MetamaskNotificationsControllerState
+  >;
+
+// Allowed Events
+export type AllowedEvents = KeyringControllerStateChangeEvent;
+
+// Type for the messenger of MetamaskNotificationsController
+export type MetamaskNotificationsControllerMessenger =
+  RestrictedControllerMessenger<
+    typeof controllerName,
+    Actions | AllowedActions,
+    AllowedEvents,
+    AllowedActions['type'],
+    AllowedEvents['type']
+  >;
+
+/**
+ * Controller that enables wallet notifications and feature announcements
+ */
+export class MetamaskNotificationsController extends BaseController<
+  typeof controllerName,
+  MetamaskNotificationsControllerState,
+  MetamaskNotificationsControllerMessenger
+> {
+  #auth = {
+    getBearerToken: async () => {
+      return await this.messagingSystem.call(
+        'AuthenticationController:getBearerToken',
+      );
+    },
+    isSignedIn: () => {
+      return this.messagingSystem.call('AuthenticationController:isSignedIn');
+    },
+  };
+
+  #storage = {
+    getStorageKey: () => {
+      return this.messagingSystem.call('UserStorageController:getStorageKey');
+    },
+    getNotificationStorage: async () => {
+      return await this.messagingSystem.call(
+        'UserStorageController:performGetStorage',
+        'notification_settings',
+      );
+    },
+    setNotificationStorage: async (state: string) => {
+      return await this.messagingSystem.call(
+        'UserStorageController:performSetStorage',
+        'notification_settings',
+        state,
+      );
+    },
+  };
+
+  #pushNotifications = {
+    enablePushNotifications: async (UUIDs: string[]) => {
+      return await this.messagingSystem.call(
+        'PushPlatformNotificationsController:enablePushNotifications',
+        UUIDs,
+      );
+    },
+    disablePushNotifications: async (UUIDs: string[]) => {
+      return await this.messagingSystem.call(
+        'PushPlatformNotificationsController:disablePushNotifications',
+        UUIDs,
+      );
+    },
+    updatePushNotifications: async (UUIDs: string[]) => {
+      return await this.messagingSystem.call(
+        'PushPlatformNotificationsController:updateTriggerPushNotifications',
+        UUIDs,
+      );
+    },
+  };
+
+  #prevAccountsSet = new Set<string>();
+
+  #accounts = {
+    /**
+     * Used to get list of addresses from keyring (wallet addresses)
+     *
+     * @returns addresses removed, added, and latest list of addresses
+     */
+    listAccounts: async () => {
+      const nonChecksumAccounts = await this.messagingSystem.call(
+        'KeyringController:getAccounts',
+      );
+      const accounts = nonChecksumAccounts.map((a) => toChecksumHexAddress(a));
+      const currentAccountsSet = new Set(accounts);
+
+      const accountsAdded = accounts.filter(
+        (a) => !this.#prevAccountsSet.has(a),
+      );
+
+      const accountsRemoved = [...this.#prevAccountsSet.values()].filter(
+        (a) => !currentAccountsSet.has(a),
+      );
+
+      this.#prevAccountsSet = new Set(accounts);
+      return {
+        accountsAdded,
+        accountsRemoved,
+        accounts,
+      };
+    },
+
+    /**
+     * Initializes the cache/previous list. This is handy so we have an accurate in-mem state of the previous list of accounts.
+     *
+     * @returns result from list accounts
+     */
+    initialize: () => {
+      return this.#accounts.listAccounts();
+    },
+
+    /**
+     * Subscription to any state change in the keyring controller (aka wallet accounts).
+     * We can call the `listAccounts` defined above to find out about any accounts added, removed
+     * And call effects to subscribe/unsubscribe to notifications.
+     */
+    subscribe: () => {
+      this.messagingSystem.subscribe(
+        'KeyringController:stateChange',
+        async () => {
+          if (!this.state.isMetamaskNotificationsEnabled) {
+            return;
+          }
+
+          const { accountsAdded, accountsRemoved } =
+            await this.#accounts.listAccounts();
+
+          const promises: Promise<unknown>[] = [];
+          if (accountsAdded.length > 0) {
+            promises.push(this.updateOnChainTriggersByAccount(accountsAdded));
+          }
+          if (accountsRemoved.length > 0) {
+            promises.push(this.deleteOnChainTriggersByAccount(accountsRemoved));
+          }
+          await Promise.all(promises);
+        },
+      );
+    },
+  };
+
+  /**
+   * Creates a MetamaskNotificationsController instance.
+   *
+   * @param args - The arguments to this function.
+   * @param args.messenger - Messenger used to communicate with BaseV2 controller.
+   * @param args.state - Initial state to set on this controller.
+   */
+  constructor({
+    messenger,
+    state,
+  }: {
+    messenger: MetamaskNotificationsControllerMessenger;
+    state?: MetamaskNotificationsControllerState;
+  }) {
+    super({
+      messenger,
+      metadata,
+      name: controllerName,
+      state: { ...defaultState, ...state },
+    });
+
+    this.#accounts.initialize();
+    this.#accounts.subscribe();
+  }
+
+  #assertAuthEnabled() {
+    if (!this.#auth.isSignedIn()) {
+      this.update((s) => {
+        s.isMetamaskNotificationsEnabled = false;
+      });
+      throw new Error('User is not signed in.');
+    }
+  }
+
+  async #getValidStorageKeyAndBearerToken() {
+    this.#assertAuthEnabled();
+
+    const bearerToken = await this.#auth.getBearerToken();
+    const storageKey = await this.#storage.getStorageKey();
+
+    if (!bearerToken || !storageKey) {
+      throw new Error('Missing BearerToken or storage key');
+    }
+
+    return { bearerToken, storageKey };
+  }
+
+  #assertUserStorage(
+    storage: UserStorage | null,
+  ): asserts storage is UserStorage {
+    if (!storage) {
+      throw new Error('User Storage does not exist');
+    }
+  }
+
+  /**
+   * Retrieves and parses the user storage from the storage key.
+   *
+   * This method attempts to retrieve the user storage using the specified storage key,
+   * then parses the JSON string to an object. If the storage is not found or cannot be parsed,
+   * it throws an error.
+   *
+   * @returns The parsed user storage object or null
+   */
+  async #getUserStorage(): Promise<UserStorage | null> {
+    const userStorageString: string | null =
+      await this.#storage.getNotificationStorage();
+
+    if (!userStorageString) {
+      return null;
+    }
+
+    try {
+      const userStorage: UserStorage = JSON.parse(userStorageString);
+      return userStorage;
+    } catch (error) {
+      log.error('Unable to parse User Storage');
+      return null;
+    }
+  }
+
+  /**
+   * @deprecated - This needs rework for it to be feasible. Currently this is a half-baked solution, as it fails once we add new triggers (introspection for filters is difficult).
+   *
+   * Checks for the complete presence of trigger types by group across all addresses in user storage.
+   *
+   * This method retrieves the user storage and uses `MetamaskNotificationsUtils` to verify if all expected trigger types for each group are present for every address.
+   * @returns A record indicating whether all expected trigger types for each group are present for every address.
+   * @throws {Error} If user storage does not exist.
+   */
+  public async checkTriggersPresenceByGroup(): Promise<
+    Record<TRIGGER_TYPES_GROUPS, boolean>
+  > {
+    const userStorage = await this.#getUserStorage();
+    this.#assertUserStorage(userStorage);
+
+    // Use MetamaskNotificationsUtils to check the presence of triggers
+    return MetamaskNotificationsUtils.checkTriggersPresenceByGroup(userStorage);
+  }
+
+  /**
+   * Returns if an account or multiple accounts are present in User Storage.
+   * This is to ensure we show the correct UI in the notification settings page,
+   * on which notifications are enabled or disabled.
+   *
+   * **Action** - If an account is enabled or disabled
+   *
+   * @param accounts - An array of account addresses to be checked for presence.
+   * @returns A record where each key is an account address and each value is a boolean indicating whether the account and all its supported chains are present in the user storage.
+   * @throws {Error} If user storage does not exist.
+   */
+  public async checkAccountsPresence(
+    accounts: string[],
+  ): Promise<Record<string, boolean>> {
+    // Retrieve user storage
+    const userStorage = await this.#getUserStorage();
+    this.#assertUserStorage(userStorage);
+
+    // Use MetamaskNotificationsUtils to check the presence of accounts
+    return MetamaskNotificationsUtils.checkAccountsPresence(
+      userStorage,
+      accounts,
+    );
+  }
+
+  /**
+   * Sets the enabled state of MetaMask notifications.
+   * This method first checks if the user is authenticated before attempting to toggle the notification settings.
+   *
+   * **Action** - This method is used to enable or disable MetaMask notifications based on the provided state.
+   *
+   * @param state - A boolean value indicating the desired enabled state of the notifications.
+   * @async
+   * @throws {Error} If the user is not authenticated or if there is an error updating the state.
+   */
+  public async setMetamaskNotificationsEnabled(state: boolean) {
+    try {
+      this.#assertAuthEnabled();
+
+      this.update((s) => {
+        s.isMetamaskNotificationsEnabled = state;
+      });
+    } catch (e) {
+      log.error('Unable to toggle notifications', e);
+      throw new Error('Unable to toggle notifications');
+    }
+  }
+
+  /**
+   * This is for a 1-time flag/CTA for notifications. When dismissed we will invoke this.
+   *
+   * **Action** - use to dismiss the Notification CTA in the UI
+   *
+   * @async
+   * @throws {Error} Throws an error if the BearerToken token or storage key is missing.
+   */
+  public async setMetamaskNotificationsFeatureSeen() {
+    try {
+      this.#assertAuthEnabled();
+
+      this.update((s) => {
+        s.isMetamaskNotificationsFeatureSeen = true;
+      });
+    } catch (e) {
+      log.error('Unable to declare feature/CTA was seen', e);
+      throw new Error('Unable to declare feature/CTA was seen');
+    }
+  }
+
+  /**
+   * Sets the enabled state of feature announcements.
+   *
+   * **Action** - used in the notification settings to enable/disable feature announcements.
+   *
+   * @param state - A boolean value indicating the desired enabled state of the feature announcements.
+   * @async
+   * @throws {Error} If the BearerToken token or storage key is missing.
+   */
+  public async setFeatureAnnouncementsEnabled(state: boolean) {
+    try {
+      this.#assertAuthEnabled();
+
+      this.update((s) => {
+        s.isFeatureAnnouncementsEnabled = state;
+      });
+    } catch (e) {
+      log.error('Unable to toggle feature announcements', e);
+      throw new Error('Unable to toggle feature announcements');
+    }
+  }
+
+  /**
+   * Sets the enabled state of Snap notifications.
+   *
+   * **Action** - used in the notifications settings page to enable/disable snap notifications.
+   *
+   * @param state - A boolean value indicating the desired enabled state of the snap notifications.
+   * @async
+   * @throws {Error} If the BearerToken token or storage key is missing.
+   */
+  public async setSnapNotificationsEnabled(state: boolean) {
+    try {
+      this.#assertAuthEnabled();
+
+      this.update((s) => {
+        s.isSnapNotificationsEnabled = state;
+      });
+    } catch (e) {
+      log.error('Unable to toggle snap notifications', e);
+    }
+  }
+
+  /**
+   * This creates/re-creates on-chain triggers defined in User Storage.
+   *
+   * **Action** - Used during Sign In / Enabling of notifications.
+   *
+   * @returns The updated or newly created user storage.
+   * @throws {Error} Throws an error if unauthenticated or from other operations.
+   */
+  public async createOnChainTriggers(): Promise<UserStorage> {
+    try {
+      const { bearerToken, storageKey } =
+        await this.#getValidStorageKeyAndBearerToken();
+      const { accounts } = await this.#accounts.listAccounts();
+
+      let userStorage = await this.#getUserStorage();
+
+      // If userStorage does not exist, create a new one
+      // All the triggers created are set as: "disabled"
+      if (userStorage?.[USER_STORAGE_VERSION_KEY] === undefined) {
+        userStorage = MetamaskNotificationsUtils.initializeUserStorage(
+          accounts.map((account) => ({ address: account })),
+          false,
+        );
+
+        // Write the userStorage
+        await this.#storage.setNotificationStorage(JSON.stringify(userStorage));
+      }
+
+      // Create the triggers
+      const triggers =
+        MetamaskNotificationsUtils.traverseUserStorageTriggers(userStorage);
+      await OnChainNotifications.createOnChainTriggers(
+        userStorage,
+        storageKey,
+        bearerToken,
+        triggers,
+      );
+
+      // Create push notifications triggers
+      const allUUIDS = MetamaskNotificationsUtils.getAllUUIDs(userStorage);
+      await this.#pushNotifications.enablePushNotifications(allUUIDS);
+
+      // Write the new userStorage (triggers are now "enabled")
+      await this.#storage.setNotificationStorage(JSON.stringify(userStorage));
+
+      // Update the state of the controller
+      this.setFeatureAnnouncementsEnabled(true);
+      this.setMetamaskNotificationsEnabled(true);
+      this.setSnapNotificationsEnabled(true);
+
+      return userStorage;
+    } catch (err) {
+      log.error('Failed to create On Chain triggers', err);
+      throw new Error('Failed to create On Chain triggers');
+    }
+  }
+
+  /**
+   * Deletes on-chain triggers associated with a specific account.
+   * This method performs several key operations:
+   * 1. Validates Auth & Storage
+   * 2. Finds and deletes all triggers associated with the account
+   * 3. Disables any related push notifications
+   * 4. Updates Storage to reflect new state.
+   *
+   * **Action** - When a user disables notifications for a given account in settings.
+   *
+   * @param accounts - The account for which on-chain triggers are to be deleted.
+   * @returns A promise that resolves to void or an object containing a success message.
+   * @throws {Error} Throws an error if unauthenticated or from other operations.
+   */
+  public async deleteOnChainTriggersByAccount(
+    accounts: string[],
+  ): Promise<UserStorage> {
+    try {
+      // Get and Validate BearerToken and User Storage Key
+      const { bearerToken, storageKey } =
+        await this.#getValidStorageKeyAndBearerToken();
+
+      // Get & Validate User Storage
+      const userStorage = await this.#getUserStorage();
+      this.#assertUserStorage(userStorage);
+
+      // Get the UUIDs to delete
+      const UUIDs = accounts
+        .map((a) =>
+          MetamaskNotificationsUtils.getUUIDsForAccount(
+            userStorage,
+            a.toLowerCase(),
+          ),
+        )
+        .flat();
+
+      if (UUIDs.length === 0) {
+        return userStorage;
+      }
+
+      // Delete these UUIDs (Mutates User Storage)
+      await OnChainNotifications.deleteOnChainTriggers(
+        userStorage,
+        storageKey,
+        bearerToken,
+        UUIDs,
+      );
+
+      // Delete these UUIDs from the push notifications
+      await this.#pushNotifications.disablePushNotifications(UUIDs);
+
+      // Update User Storage
+      await this.#storage.setNotificationStorage(JSON.stringify(userStorage));
+
+      return userStorage;
+    } catch (err) {
+      log.error('Failed to delete OnChain triggers', err);
+      throw new Error('Failed to delete OnChain triggers');
+    }
+  }
+
+  /**
+   * Updates/Creates on-chain triggers for a specific account.
+   *
+   * This method performs several key operations:
+   * 1. Validates Auth & Storage
+   * 2. Finds and creates any missing triggers associated with the account
+   * 3. Enables any related push notifications
+   * 4. Updates Storage to reflect new state.
+   *
+   * **Action** - When a user enables notifications for an account
+   *
+   * @param accounts - List of accounts you want to update.
+   * @returns A promise that resolves to the updated user storage.
+   * @throws {Error} Throws an error if unauthenticated or from other operations.
+   */
+  public async updateOnChainTriggersByAccount(
+    accounts: string[],
+  ): Promise<UserStorage> {
+    try {
+      // Get and Validate BearerToken and User Storage Key
+      const { bearerToken, storageKey } =
+        await this.#getValidStorageKeyAndBearerToken();
+
+      // Get & Validate User Storage
+      const userStorage = await this.#getUserStorage();
+      this.#assertUserStorage(userStorage);
+
+      // Add any missing triggers
+      accounts.forEach((a) =>
+        MetamaskNotificationsUtils.upsertAddressTriggers(a, userStorage),
+      );
+
+      // Write te updated userStorage (where triggers are disabled)
+      await this.#storage.setNotificationStorage(JSON.stringify(userStorage));
+
+      // Create the triggers
+      const triggers = MetamaskNotificationsUtils.traverseUserStorageTriggers(
+        userStorage,
+        {
+          mapTrigger: (t) => {
+            if (
+              accounts.some((a) => a.toLowerCase() === t.address.toLowerCase())
+            ) {
+              return t;
+            }
+            return undefined;
+          },
+        },
+      );
+      await OnChainNotifications.createOnChainTriggers(
+        userStorage,
+        storageKey,
+        bearerToken,
+        triggers,
+      );
+
+      // Update Push Notifications Triggers
+      const UUIDs = MetamaskNotificationsUtils.getAllUUIDs(userStorage);
+      await this.#pushNotifications.updatePushNotifications(UUIDs);
+
+      // Update the userStorage (where triggers are enabled)
+      await this.#storage.setNotificationStorage(JSON.stringify(userStorage));
+
+      return userStorage;
+    } catch (err) {
+      log.error('Failed to update OnChain triggers', err);
+      throw new Error('Failed to update OnChain triggers');
+    }
+  }
+
+  /**
+   * Fetches the list of metamask notifications.
+   * This includes OnChain notifications and Feature Announcements.
+   *
+   * **Action** - When a user views the notification list page/dropdown
+   *
+   * @throws {Error} Throws an error if unauthenticated or from other operations.
+   */
+  public async fetchAndUpdateMetamaskNotifications(): Promise<Notification[]> {
+    try {
+      // Raw Feature Notifications
+      const rawFeatureAnnouncementNotifications =
+        await FeatureNotifications.getFeatureAnnouncementNotifications().catch(
+          () => [],
+        );
+
+      // Raw On Chain Notifications
+      const rawOnChainNotifications: OnChainRawNotification[] = [];
+      const userStorage = await this.#storage
+        .getNotificationStorage()
+        .then((s) => s && (JSON.parse(s) as UserStorage))
+        .catch(() => null);
+      const bearerToken = await this.#auth.getBearerToken().catch(() => null);
+      if (userStorage && bearerToken) {
+        const notifications =
+          await OnChainNotifications.getOnChainNotifications(
+            userStorage,
+            bearerToken,
+          ).catch(() => []);
+
+        rawOnChainNotifications.push(...notifications);
+      }
+
+      const readIds = this.state.metamaskNotificationsReadList;
+
+      // Combined Notifications
+      const isNotUndefined = <T>(t?: T): t is T => Boolean(t);
+      const processAndFilter = (
+        ns: (FeatureAnnouncementRawNotification | OnChainRawNotification)[],
+      ) =>
+        ns
+          .map((n) => {
+            try {
+              return processNotification(n, readIds);
+            } catch {
+              // So we don't throw and show no notifications
+              return undefined;
+            }
+          })
+          .filter(isNotUndefined);
+
+      const featureAnnouncementNotifications = processAndFilter(
+        rawFeatureAnnouncementNotifications,
+      );
+      const onChainNotifications = processAndFilter(rawOnChainNotifications);
+
+      const metamaskNotifications: Notification[] = [
+        ...featureAnnouncementNotifications,
+        ...onChainNotifications,
+      ];
+      metamaskNotifications.sort(
+        (a, b) =>
+          new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
+      );
+
+      // Update State
+      this.update((s) => {
+        s.metamaskNotificationsList = metamaskNotifications;
+      });
+
+      return metamaskNotifications;
+    } catch (err) {
+      log.error('Failed to fetch notifications', err);
+      throw new Error('Failed to fetch notifications');
+    }
+  }
+
+  /**
+   * Marks specified metamask notifications as read.
+   *
+   * @param notifications - An array of notifications to be marked as read. Each notification should include its type and read status.
+   * @returns A promise that resolves when the operation is complete.
+   */
+  public async markMetamaskNotificationsAsRead(
+    notifications: MarkAsReadNotificationsParam,
+  ): Promise<void> {
+    let onchainNotificationIds: string[] = [];
+    let featureAnnouncementNotificationIds: string[] = [];
+
+    try {
+      // Filter unread on/off chain notifications
+      const onChainNotifications = notifications.filter(
+        (notification) =>
+          notification.type !== TRIGGER_TYPES.FEATURES_ANNOUNCEMENT &&
+          !notification.isRead,
+      );
+
+      const featureAnnouncementNotifications = notifications.filter(
+        (notification) =>
+          notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT &&
+          !notification.isRead,
+      );
+
+      // Mark On-Chain Notifications as Read
+      if (onChainNotifications.length > 0) {
+        const bearerToken = await this.#auth.getBearerToken();
+
+        if (bearerToken) {
+          onchainNotificationIds = onChainNotifications.map(
+            (notification) => notification.id,
+          );
+          await OnChainNotifications.markNotificationsAsRead(
+            bearerToken,
+            onchainNotificationIds,
+          ).catch(() => {
+            onchainNotificationIds = [];
+            log.warn('Unable to mark onchain notifications as read');
+          });
+        }
+      }
+
+      // Mark Off-Chain notifications as Read
+      if (featureAnnouncementNotifications.length > 0) {
+        featureAnnouncementNotificationIds =
+          featureAnnouncementNotifications.map(
+            (notification) => notification.id,
+          );
+      }
+    } catch (err) {
+      log.warn('Something failed when marking notifications as read', err);
+    }
+
+    // Update the state (state is also used on counter & badge)
+    this.update((s) => {
+      const currentReadList = s.metamaskNotificationsReadList;
+      const newReadIds = [
+        ...onchainNotificationIds,
+        ...featureAnnouncementNotificationIds,
+      ];
+      s.metamaskNotificationsReadList = [
+        ...new Set([...currentReadList, ...newReadIds]),
+      ];
+    });
+  }
+}
diff --git a/app/scripts/controllers/metamask-notifications/mocks/mock-feature-announcements.ts b/app/scripts/controllers/metamask-notifications/mocks/mock-feature-announcements.ts
new file mode 100644
index 000000000000..7410b78ee3be
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/mocks/mock-feature-announcements.ts
@@ -0,0 +1,224 @@
+import nock from 'nock';
+import {
+  ContentfulResult,
+  FEATURE_ANNOUNCEMENT_URL,
+} from '../services/feature-announcements';
+import { FeatureAnnouncementRawNotification } from '../types/feature-announcement/feature-announcement';
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+
+type MockReply = {
+  status: nock.StatusCode;
+  body?: nock.Body;
+};
+
+export function mockFetchFeatureAnnouncementNotifications(
+  mockReply?: MockReply,
+) {
+  const reply = mockReply ?? { status: 200, body: { items: [] } };
+  const mockEndpoint = nock(FEATURE_ANNOUNCEMENT_URL)
+    .get('')
+    .query(true)
+    .reply(reply.status, reply.body);
+
+  return mockEndpoint;
+}
+
+export function createMockFeatureAnnouncementAPIResult(): ContentfulResult {
+  return {
+    sys: {
+      type: 'Array',
+    },
+    total: 17,
+    skip: 0,
+    limit: 1,
+    items: [
+      {
+        metadata: {
+          tags: [],
+        },
+        sys: {
+          space: {
+            sys: {
+              type: 'Link',
+              linkType: 'Space',
+              id: 'jdkgyfmyd9sw',
+            },
+          },
+          id: '1ABRmHaNCgmxROKXXLXsMu',
+          type: 'Entry',
+          createdAt: '2024-04-09T13:24:01.872Z',
+          updatedAt: '2024-04-09T13:24:01.872Z',
+          environment: {
+            sys: {
+              id: 'master',
+              type: 'Link',
+              linkType: 'Environment',
+            },
+          },
+          revision: 1,
+          contentType: {
+            sys: {
+              type: 'Link',
+              linkType: 'ContentType',
+              id: 'productAnnouncement',
+            },
+          },
+          locale: 'en-US',
+        },
+        fields: {
+          title: 'Don’t miss out on airdrops and new NFT mints!',
+          id: 'dont-miss-out-on-airdrops-and-new-nft-mints',
+          category: 'ANNOUNCEMENT',
+          shortDescription:
+            'Check your airdrop eligibility and see trending NFT drops. Head over to the Explore tab to get started. ',
+          image: {
+            sys: {
+              type: 'Link',
+              linkType: 'Asset',
+              id: '5jqq8sFeLc6XEoeWlpI3aB',
+            },
+          },
+          longDescription: {
+            data: {},
+            content: [
+              {
+                data: {},
+                content: [
+                  {
+                    data: {},
+                    marks: [],
+                    value:
+                      'You can now verify if any of your connected addresses are eligible for airdrops and other ERC-20 claims in a secure and convenient way. We’ve also added trending NFT mints based on creators you’ve minted from before or other tokens you hold. Head over to the Explore tab to get started. \n',
+                    nodeType: 'text',
+                  },
+                ],
+                nodeType: 'paragraph',
+              },
+            ],
+            nodeType: 'document',
+          },
+          link: {
+            sys: {
+              type: 'Link',
+              linkType: 'Entry',
+              id: '62xKYM2ydo4F1mS5q97K5q',
+            },
+          },
+        },
+      },
+    ],
+    includes: {
+      Entry: [
+        {
+          metadata: {
+            tags: [],
+          },
+          sys: {
+            space: {
+              sys: {
+                type: 'Link',
+                linkType: 'Space',
+                id: 'jdkgyfmyd9sw',
+              },
+            },
+            id: '62xKYM2ydo4F1mS5q97K5q',
+            type: 'Entry',
+            createdAt: '2024-04-09T13:23:03.636Z',
+            updatedAt: '2024-04-09T13:23:03.636Z',
+            environment: {
+              sys: {
+                id: 'master',
+                type: 'Link',
+                linkType: 'Environment',
+              },
+            },
+            revision: 1,
+            contentType: {
+              sys: {
+                type: 'Link',
+                linkType: 'ContentType',
+                id: 'link',
+              },
+            },
+            locale: 'en-US',
+          },
+          fields: {
+            linkText: 'Try now',
+            linkUrl: 'https://portfolio.metamask.io/explore',
+            isExternal: false,
+          },
+        },
+      ],
+      Asset: [
+        {
+          metadata: {
+            tags: [],
+          },
+          sys: {
+            space: {
+              sys: {
+                type: 'Link',
+                linkType: 'Space',
+                id: 'jdkgyfmyd9sw',
+              },
+            },
+            id: '5jqq8sFeLc6XEoeWlpI3aB',
+            type: 'Asset',
+            createdAt: '2024-04-09T13:23:13.327Z',
+            updatedAt: '2024-04-09T13:23:13.327Z',
+            environment: {
+              sys: {
+                id: 'master',
+                type: 'Link',
+                linkType: 'Environment',
+              },
+            },
+            revision: 1,
+            locale: 'en-US',
+          },
+          fields: {
+            title: 'PDAPP notification image Airdrops & NFT mints',
+            description: '',
+            file: {
+              url: '//images.ctfassets.net/jdkgyfmyd9sw/5jqq8sFeLc6XEoeWlpI3aB/73ee0f1afa9916c3a7538b0bbee09c26/PDAPP_notification_image_Airdrops___NFT_mints.png',
+              details: {
+                size: 797731,
+                image: {
+                  width: 2880,
+                  height: 1921,
+                },
+              },
+              fileName: 'PDAPP notification image_Airdrops & NFT mints.png',
+              contentType: 'image/png',
+            },
+          },
+        },
+      ],
+    },
+  } as unknown as ContentfulResult;
+}
+
+export function createMockFeatureAnnouncementRaw(): FeatureAnnouncementRawNotification {
+  return {
+    type: TRIGGER_TYPES.FEATURES_ANNOUNCEMENT,
+    createdAt: '2999-04-09T13:24:01.872Z',
+    data: {
+      id: 'dont-miss-out-on-airdrops-and-new-nft-mints',
+      category: 'ANNOUNCEMENT',
+      title: 'Don’t miss out on airdrops and new NFT mints!',
+      longDescription: `<p>You can now verify if any of your connected addresses are eligible for airdrops and other ERC-20 claims in a secure and convenient way. We’ve also added trending NFT mints based on creators you’ve minted from before or other tokens you hold. Head over to the Explore tab to get started.</p>`,
+      shortDescription:
+        'Check your airdrop eligibility and see trending NFT drops. Head over to the Explore tab to get started.',
+      image: {
+        title: 'PDAPP notification image Airdrops & NFT mints',
+        description: '',
+        url: '//images.ctfassets.net/jdkgyfmyd9sw/5jqq8sFeLc6XEoeWlpI3aB/73ee0f1afa9916c3a7538b0bbee09c26/PDAPP_notification_image_Airdrops___NFT_mints.png',
+      },
+      link: {
+        linkText: 'Try now',
+        linkUrl: 'https://portfolio.metamask.io/explore',
+        isExternal: false,
+      },
+    },
+  };
+}
diff --git a/app/scripts/controllers/metamask-notifications/mocks/mock-notification-trigger.ts b/app/scripts/controllers/metamask-notifications/mocks/mock-notification-trigger.ts
new file mode 100644
index 000000000000..d4ce4a61114f
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/mocks/mock-notification-trigger.ts
@@ -0,0 +1,15 @@
+import { v4 as uuidv4 } from 'uuid';
+import { NotificationTrigger } from '../utils/utils';
+
+export function createMockNotificationTrigger(
+  override?: Partial<NotificationTrigger>,
+): NotificationTrigger {
+  return {
+    id: uuidv4(),
+    address: '0xFAKE_ADDRESS',
+    chainId: '1',
+    kind: 'eth_sent',
+    enabled: true,
+    ...override,
+  };
+}
diff --git a/app/scripts/controllers/metamask-notifications/mocks/mock-notification-user-storage.ts b/app/scripts/controllers/metamask-notifications/mocks/mock-notification-user-storage.ts
new file mode 100644
index 000000000000..831a9633d6c6
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/mocks/mock-notification-user-storage.ts
@@ -0,0 +1,72 @@
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import { USER_STORAGE_VERSION_KEY } from '../constants/constants';
+import { UserStorage } from '../types/user-storage/user-storage';
+import { initializeUserStorage } from '../utils/utils';
+
+export const MOCK_USER_STORAGE_ACCOUNT =
+  '0x0000000000000000000000000000000000000000';
+export const MOCK_USER_STORAGE_CHAIN = '1';
+
+export function createMockUserStorage(
+  override?: Partial<UserStorage>,
+): UserStorage {
+  return {
+    [USER_STORAGE_VERSION_KEY]: '1',
+    [MOCK_USER_STORAGE_ACCOUNT]: {
+      [MOCK_USER_STORAGE_CHAIN]: {
+        '111-111-111-111': {
+          k: TRIGGER_TYPES.ERC20_RECEIVED,
+          e: true,
+        },
+        '222-222-222-222': {
+          k: TRIGGER_TYPES.ERC20_SENT,
+          e: true,
+        },
+      },
+    },
+    ...override,
+  };
+}
+
+export function createMockUserStorageWithTriggers(
+  triggers: string[] | { id: string; e: boolean; k?: TRIGGER_TYPES }[],
+): UserStorage {
+  const userStorage: UserStorage = {
+    [USER_STORAGE_VERSION_KEY]: '1',
+    [MOCK_USER_STORAGE_ACCOUNT]: {
+      [MOCK_USER_STORAGE_CHAIN]: {},
+    },
+  };
+
+  // insert triggerIds
+  triggers.forEach((t) => {
+    let tId: string;
+    let e: boolean;
+    let k: TRIGGER_TYPES;
+    if (typeof t === 'string') {
+      tId = t;
+      e = true;
+      k = TRIGGER_TYPES.ERC20_RECEIVED;
+    } else {
+      tId = t.id;
+      e = t.e;
+      k = t.k ?? TRIGGER_TYPES.ERC20_RECEIVED;
+    }
+
+    userStorage[MOCK_USER_STORAGE_ACCOUNT][MOCK_USER_STORAGE_CHAIN][tId] = {
+      k,
+      e,
+    };
+  });
+
+  return userStorage;
+}
+
+export function createMockFullUserStorage(
+  props: { triggersEnabled?: boolean } = {},
+): UserStorage {
+  return initializeUserStorage(
+    [{ address: MOCK_USER_STORAGE_ACCOUNT }],
+    props.triggersEnabled ?? true,
+  );
+}
diff --git a/app/scripts/controllers/metamask-notifications/mocks/mock-onchain-notifications.ts b/app/scripts/controllers/metamask-notifications/mocks/mock-onchain-notifications.ts
new file mode 100644
index 000000000000..cd8f9e5979c9
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/mocks/mock-onchain-notifications.ts
@@ -0,0 +1,58 @@
+import nock from 'nock';
+import {
+  NOTIFICATION_API_LIST_ENDPOINT,
+  NOTIFICATION_API_MARK_ALL_AS_READ_ENDPOINT,
+  TRIGGER_API_BATCH_ENDPOINT,
+} from '../services/onchain-notifications';
+import { createMockRawOnChainNotifications } from './mock-raw-notifications';
+
+type MockReply = {
+  status: nock.StatusCode;
+  body?: nock.Body;
+};
+
+export function mockBatchCreateTriggers(mockReply?: MockReply) {
+  const reply = mockReply ?? { status: 204 };
+
+  const mockEndpoint = nock(TRIGGER_API_BATCH_ENDPOINT)
+    .post('')
+    .reply(reply.status, reply.body);
+
+  return mockEndpoint;
+}
+
+export function mockBatchDeleteTriggers(mockReply?: MockReply) {
+  const reply = mockReply ?? { status: 204 };
+
+  const mockEndpoint = nock(TRIGGER_API_BATCH_ENDPOINT)
+    .delete('')
+    .reply(reply.status, reply.body);
+
+  return mockEndpoint;
+}
+
+export function mockListNotifications(mockReply?: MockReply) {
+  const reply = mockReply ?? {
+    status: 200,
+    body: createMockRawOnChainNotifications(),
+  };
+
+  const mockEndpoint = nock(NOTIFICATION_API_LIST_ENDPOINT)
+    .post('')
+    .query(true)
+    .reply(reply.status, reply.body);
+
+  return mockEndpoint;
+}
+
+export function mockMarkNotificationsAsRead(mockReply?: MockReply) {
+  const reply = mockReply ?? {
+    status: 200,
+  };
+
+  const mockEndpoint = nock(NOTIFICATION_API_MARK_ALL_AS_READ_ENDPOINT)
+    .post('')
+    .reply(reply.status, reply.body);
+
+  return mockEndpoint;
+}
diff --git a/app/scripts/controllers/metamask-notifications/mocks/mock-raw-notifications.ts b/app/scripts/controllers/metamask-notifications/mocks/mock-raw-notifications.ts
new file mode 100644
index 000000000000..daf9c995f413
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/mocks/mock-raw-notifications.ts
@@ -0,0 +1,590 @@
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import type { OnChainRawNotification } from '../types/on-chain-notification/on-chain-notification';
+
+export function createMockNotificationEthSent() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ETH_SENT,
+    id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    trigger_id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    chain_id: 1,
+    block_number: 17485840,
+    block_timestamp: '2022-03-01T00:00:00Z',
+    tx_hash: '0x881D40237659C251811CEC9c364ef91dC08D300C',
+    unread: true,
+    created_at: '2022-03-01T00:00:00Z',
+    data: {
+      kind: 'eth_sent',
+      network_fee: {
+        gas_price: '207806259583',
+        native_token_price_in_usd: '0.83',
+      },
+      from: '0x881D40237659C251811CEC9c364ef91dC08D300C',
+      to: '0x881D40237659C251811CEC9c364ef91dC08D300D',
+      amount: {
+        usd: '670.64',
+        eth: '0.005',
+      },
+    },
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationEthReceived() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ETH_RECEIVED,
+    id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    trigger_id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    chain_id: 1,
+    block_number: 17485840,
+    block_timestamp: '2022-03-01T00:00:00Z',
+    tx_hash: '0x881D40237659C251811CEC9c364ef91dC08D300C',
+    unread: true,
+    created_at: '2022-03-01T00:00:00Z',
+    data: {
+      kind: 'eth_received',
+      network_fee: {
+        gas_price: '207806259583',
+        native_token_price_in_usd: '0.83',
+      },
+      from: '0x881D40237659C251811CEC9c364ef91dC08D300C',
+      to: '0x881D40237659C251811CEC9c364ef91dC08D300D',
+      amount: {
+        usd: '670.64',
+        eth: '808.000000000000000000',
+      },
+    },
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationERC20Sent() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ERC20_SENT,
+    id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    trigger_id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    chain_id: 1,
+    block_number: 17485840,
+    block_timestamp: '2022-03-01T00:00:00Z',
+    tx_hash: '0x881D40237659C251811CEC9c364ef91dC08D300C',
+    unread: true,
+    created_at: '2022-03-01T00:00:00Z',
+    data: {
+      kind: 'erc20_sent',
+      network_fee: {
+        gas_price: '207806259583',
+        native_token_price_in_usd: '0.83',
+      },
+      to: '0xecc19e177d24551aa7ed6bc6fe566eca726cc8a9',
+      from: '0x1231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+      token: {
+        usd: '1.00',
+        name: 'USDC',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/usdc.svg',
+        amount: '4956250000',
+        symbol: 'USDC',
+        address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+        decimals: '6',
+      },
+    },
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationERC20Received() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ERC20_RECEIVED,
+    id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    trigger_id: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+    chain_id: 1,
+    block_number: 17485840,
+    block_timestamp: '2022-03-01T00:00:00Z',
+    tx_hash: '0x881D40237659C251811CEC9c364ef91dC08D300C',
+    unread: true,
+    created_at: '2022-03-01T00:00:00Z',
+    data: {
+      kind: 'erc20_received',
+      network_fee: {
+        gas_price: '207806259583',
+        native_token_price_in_usd: '0.83',
+      },
+      to: '0xeae7380dd4cef6fbd1144f49e4d1e6964258a4f4',
+      from: '0x51c72848c68a965f66fa7a88855f9f7784502a7f',
+      token: {
+        usd: '0.00',
+        name: 'SHIBA INU',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/shib.svg',
+        amount: '8382798736999999457296646144',
+        symbol: 'SHIB',
+        address: '0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce',
+        decimals: '18',
+      },
+    },
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationERC721Sent() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ERC721_SENT,
+    block_number: 18576643,
+    block_timestamp: '1700043467',
+    chain_id: 1,
+    created_at: '2023-11-15T11:08:17.895407Z',
+    data: {
+      to: '0xf47f628fe3bd2595e9ab384bfffc3859b448e451',
+      nft: {
+        name: 'Captainz #8680',
+        image:
+          'https://i.seadn.io/s/raw/files/ae0fc06714ff7fb40217340d8a242c0e.gif?w=500&auto=format',
+        token_id: '8680',
+        collection: {
+          name: 'The Captainz',
+          image:
+            'https://i.seadn.io/gcs/files/6df4d75778066bce740050615bc84e21.png?w=500&auto=format',
+          symbol: 'Captainz',
+          address: '0x769272677fab02575e84945f03eca517acc544cc',
+        },
+      },
+      from: '0x24a0bb54b7e7a8e406e9b28058a9fd6c49e6df4f',
+      kind: 'erc721_sent',
+      network_fee: {
+        gas_price: '24550653274',
+        native_token_price_in_usd: '1986.61',
+      },
+    },
+    id: 'a4193058-9814-537e-9df4-79dcac727fb6',
+    trigger_id: '028485be-b994-422b-a93b-03fcc01ab715',
+    tx_hash:
+      '0x0833c69fb41cf972a0f031fceca242939bc3fcf82b964b74606649abcad371bd',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationERC721Received() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ERC721_RECEIVED,
+    block_number: 18571446,
+    block_timestamp: '1699980623',
+    chain_id: 1,
+    created_at: '2023-11-14T17:40:52.319281Z',
+    data: {
+      to: '0xba7f3daa8adfdad686574406ab9bd5d2f0a49d2e',
+      nft: {
+        name: 'The Plague #2722',
+        image:
+          'https://i.seadn.io/s/raw/files/a96f90ec8ebf55a2300c66a0c46d6a16.png?w=500&auto=format',
+        token_id: '2722',
+        collection: {
+          name: 'The Plague NFT',
+          image:
+            'https://i.seadn.io/gcs/files/4577987a5ca45ca5118b2e31559ee4d1.jpg?w=500&auto=format',
+          symbol: 'FROG',
+          address: '0xc379e535caff250a01caa6c3724ed1359fe5c29b',
+        },
+      },
+      from: '0x24a0bb54b7e7a8e406e9b28058a9fd6c49e6df4f',
+      kind: 'erc721_received',
+      network_fee: {
+        gas_price: '53701898538',
+        native_token_price_in_usd: '2047.01',
+      },
+    },
+    id: '00a79d24-befa-57ed-a55a-9eb8696e1654',
+    trigger_id: 'd24ac26a-8579-49ec-9947-d04d63592ebd',
+    tx_hash:
+      '0xe554c9e29e6eeca8ba94da4d047334ba08b8eb9ca3b801dd69cec08dfdd4ae43',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationERC1155Sent() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ERC1155_SENT,
+    block_number: 18615206,
+    block_timestamp: '1700510003',
+    chain_id: 1,
+    created_at: '2023-11-20T20:44:10.110706Z',
+    data: {
+      to: '0x15bd77ccacf2da39b84f0c31fee2e451225bb190',
+      nft: {
+        name: 'IlluminatiNFT DAO',
+        image:
+          'https://i.seadn.io/gcs/files/79a77cb37c7b2f1069f752645d29fea7.jpg?w=500&auto=format',
+        token_id: '1',
+        collection: {
+          name: 'IlluminatiNFT DAO',
+          image:
+            'https://i.seadn.io/gae/LTKz3om2eCQfn3M6PkqEmY7KhLtdMCOm0QVch2318KJq7-KyToCH7NBTMo4UuJ0AZI-oaBh1HcgrAEIEWYbXY3uMcYpuGXunaXEh?w=500&auto=format',
+          symbol: 'TRUTH',
+          address: '0xe25f0fe686477f9df3c2876c4902d3b85f75f33a',
+        },
+      },
+      from: '0x0000000000000000000000000000000000000000',
+      kind: 'erc1155_sent',
+      network_fee: {
+        gas_price: '33571446596',
+        native_token_price_in_usd: '2038.88',
+      },
+    },
+    id: 'a09ff9d1-623a-52ab-a3d4-c7c8c9a58362',
+    trigger_id: 'e2130f7d-78b8-4c34-999a-3f3d3bb5b03c',
+    tx_hash:
+      '0x03381aba290facbaf71c123e263c8dc3dd550aac00ef589cce395182eaeff76f',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationERC1155Received() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ERC1155_RECEIVED,
+    block_number: 18615206,
+    block_timestamp: '1700510003',
+    chain_id: 1,
+    created_at: '2023-11-20T20:44:10.110706Z',
+    data: {
+      to: '0x15bd77ccacf2da39b84f0c31fee2e451225bb190',
+      nft: {
+        name: 'IlluminatiNFT DAO',
+        image:
+          'https://i.seadn.io/gcs/files/79a77cb37c7b2f1069f752645d29fea7.jpg?w=500&auto=format',
+        token_id: '1',
+        collection: {
+          name: 'IlluminatiNFT DAO',
+          image:
+            'https://i.seadn.io/gae/LTKz3om2eCQfn3M6PkqEmY7KhLtdMCOm0QVch2318KJq7-KyToCH7NBTMo4UuJ0AZI-oaBh1HcgrAEIEWYbXY3uMcYpuGXunaXEh?w=500&auto=format',
+          symbol: 'TRUTH',
+          address: '0xe25f0fe686477f9df3c2876c4902d3b85f75f33a',
+        },
+      },
+      from: '0x0000000000000000000000000000000000000000',
+      kind: 'erc1155_received',
+      network_fee: {
+        gas_price: '33571446596',
+        native_token_price_in_usd: '2038.88',
+      },
+    },
+    id: 'b6b93c84-e8dc-54ed-9396-7ea50474843a',
+    trigger_id: '710c8abb-43a9-42a5-9d86-9dd258726c82',
+    tx_hash:
+      '0x03381aba290facbaf71c123e263c8dc3dd550aac00ef589cce395182eaeff76f',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationMetaMaskSwapsCompleted() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.METAMASK_SWAP_COMPLETED,
+    block_number: 18377666,
+    block_timestamp: '1697637275',
+    chain_id: 1,
+    created_at: '2023-10-18T13:58:49.854596Z',
+    data: {
+      kind: 'metamask_swap_completed',
+      rate: '1558.27',
+      token_in: {
+        usd: '1576.73',
+        image:
+          'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
+        amount: '9000000000000000',
+        symbol: 'ETH',
+        address: '0x0000000000000000000000000000000000000000',
+        decimals: '18',
+        name: 'Ethereum',
+      },
+      token_out: {
+        usd: '1.00',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/usdt.svg',
+        amount: '14024419',
+        symbol: 'USDT',
+        address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+        decimals: '6',
+        name: 'USDT',
+      },
+      network_fee: {
+        gas_price: '15406129273',
+        native_token_price_in_usd: '1576.73',
+      },
+    },
+    id: '7ddfe6a1-ac52-5ffe-aa40-f04242db4b8b',
+    trigger_id: 'd2eaa2eb-2e6e-4fd5-8763-b70ea571b46c',
+    tx_hash:
+      '0xf69074290f3aa11bce567aabc9ca0df7a12559dfae1b80ba1a124e9dfe19ecc5',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationRocketPoolStakeCompleted() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ROCKETPOOL_STAKE_COMPLETED,
+    block_number: 18585057,
+    block_timestamp: '1700145059',
+    chain_id: 1,
+    created_at: '2023-11-20T12:02:48.796824Z',
+    data: {
+      kind: 'rocketpool_stake_completed',
+      stake_in: {
+        usd: '2031.86',
+        name: 'Ethereum',
+        image:
+          'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
+        amount: '190690478063438272',
+        symbol: 'ETH',
+        address: '0x0000000000000000000000000000000000000000',
+        decimals: '18',
+      },
+      stake_out: {
+        usd: '2226.49',
+        name: 'Rocket Pool ETH',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/rETH.svg',
+        amount: '175024360778165879',
+        symbol: 'RETH',
+        address: '0xae78736Cd615f374D3085123A210448E74Fc6393',
+        decimals: '18',
+      },
+      network_fee: {
+        gas_price: '36000000000',
+        native_token_price_in_usd: '2031.86',
+      },
+    },
+    id: 'c2a2f225-b2fb-5d6c-ba56-e27a5c71ffb9',
+    trigger_id: '5110ff97-acff-40c0-83b4-11d487b8c7b0',
+    tx_hash:
+      '0xcfc0693bf47995907b0f46ef0644cf16dd9a0de797099b2e00fd481e1b2117d3',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationRocketPoolUnStakeCompleted() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.ROCKETPOOL_UNSTAKE_COMPLETED,
+    block_number: 18384336,
+    block_timestamp: '1697718011',
+    chain_id: 1,
+    created_at: '2023-10-19T13:11:10.623042Z',
+    data: {
+      kind: 'rocketpool_unstake_completed',
+      stake_in: {
+        usd: '1686.34',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/rETH.svg',
+        amount: '66608041413696770',
+        symbol: 'RETH',
+        address: '0xae78736Cd615f374D3085123A210448E74Fc6393',
+        decimals: '18',
+        name: 'Rocketpool Eth',
+      },
+      stake_out: {
+        usd: '1553.75',
+        image:
+          'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
+        amount: '72387843427700824',
+        symbol: 'ETH',
+        address: '0x0000000000000000000000000000000000000000',
+        decimals: '18',
+        name: 'Ethereum',
+      },
+      network_fee: {
+        gas_price: '5656322987',
+        native_token_price_in_usd: '1553.75',
+      },
+    },
+    id: 'd8c246e7-a0a4-5f1d-b079-2b1707665fbc',
+    trigger_id: '291ec897-f569-4837-b6c0-21001b198dff',
+    tx_hash:
+      '0xc7972a7e409abfc62590ec90e633acd70b9b74e76ad02305be8bf133a0e22d5f',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationLidoStakeCompleted() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.LIDO_STAKE_COMPLETED,
+    block_number: 18487118,
+    block_timestamp: '1698961091',
+    chain_id: 1,
+    created_at: '2023-11-02T22:28:49.970865Z',
+    data: {
+      kind: 'lido_stake_completed',
+      stake_in: {
+        usd: '1806.33',
+        name: 'Ethereum',
+        image:
+          'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
+        amount: '330303634023928032',
+        symbol: 'ETH',
+        address: '0x0000000000000000000000000000000000000000',
+        decimals: '18',
+      },
+      stake_out: {
+        usd: '1801.30',
+        name: 'Liquid staked Ether 2.0',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/stETH.svg',
+        amount: '330303634023928032',
+        symbol: 'STETH',
+        address: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84',
+        decimals: '18',
+      },
+      network_fee: {
+        gas_price: '26536359866',
+        native_token_price_in_usd: '1806.33',
+      },
+    },
+    id: '9d9b1467-b3ee-5492-8ca2-22382657b690',
+    trigger_id: 'ec10d66a-f78f-461f-83c9-609aada8cc50',
+    tx_hash:
+      '0x8cc0fa805f7c3b1743b14f3b91c6b824113b094f26d4ccaf6a71ad8547ce6a0f',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationLidoWithdrawalRequested() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.LIDO_WITHDRAWAL_REQUESTED,
+    block_number: 18377760,
+    block_timestamp: '1697638415',
+    chain_id: 1,
+    created_at: '2023-10-18T15:04:02.482526Z',
+    data: {
+      kind: 'lido_withdrawal_requested',
+      stake_in: {
+        usd: '1568.54',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/stETH.svg',
+        amount: '97180668792218669859',
+        symbol: 'STETH',
+        address: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84',
+        decimals: '18',
+        name: 'Staked Eth',
+      },
+      stake_out: {
+        usd: '1576.73',
+        image:
+          'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
+        amount: '97180668792218669859',
+        symbol: 'ETH',
+        address: '0x0000000000000000000000000000000000000000',
+        decimals: '18',
+        name: 'Ethereum',
+      },
+      network_fee: {
+        gas_price: '11658906980',
+        native_token_price_in_usd: '1576.73',
+      },
+    },
+    id: '29ddc718-78c6-5f91-936f-2bef13a605f0',
+    trigger_id: 'ef003925-3379-4ba7-9e2d-8218690cadc8',
+    tx_hash:
+      '0x58b5f82e084cb750ea174e02b20fbdfd2ba8d78053deac787f34fc38e5d427aa',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationLidoWithdrawalCompleted() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.LIDO_WITHDRAWAL_COMPLETED,
+    block_number: 18378208,
+    block_timestamp: '1697643851',
+    chain_id: 1,
+    created_at: '2023-10-18T16:35:03.147606Z',
+    data: {
+      kind: 'lido_withdrawal_completed',
+      stake_in: {
+        usd: '1570.23',
+        image:
+          'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/stETH.svg',
+        amount: '35081997661451346',
+        symbol: 'STETH',
+        address: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84',
+        decimals: '18',
+        name: 'Staked Eth',
+      },
+      stake_out: {
+        usd: '1571.74',
+        image:
+          'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
+        amount: '35081997661451346',
+        symbol: 'ETH',
+        address: '0x0000000000000000000000000000000000000000',
+        decimals: '18',
+        name: 'Ethereum',
+      },
+      network_fee: {
+        gas_price: '12699495150',
+        native_token_price_in_usd: '1571.74',
+      },
+    },
+    id: 'f4ef0b7f-5612-537f-9144-0b5c63ae5391',
+    trigger_id: 'd73df14d-ce73-4f38-bad3-ab028154042c',
+    tx_hash:
+      '0xe6d210d2e601ef3dd1075c48e71452cf35f2daae3886911e964e3babad8ac657',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockNotificationLidoReadyToBeWithdrawn() {
+  const mockNotification: OnChainRawNotification = {
+    type: TRIGGER_TYPES.LIDO_STAKE_READY_TO_BE_WITHDRAWN,
+    block_number: 18378208,
+    block_timestamp: '1697643851',
+    chain_id: 1,
+    created_at: '2023-10-18T16:35:03.147606Z',
+    data: {
+      kind: 'lido_stake_ready_to_be_withdrawn',
+      request_id: '123456789',
+      staked_eth: {
+        address: '0x881D40237659C251811CEC9c364ef91dC08D300F',
+        symbol: 'ETH',
+        name: 'Ethereum',
+        amount: '2.5',
+        decimals: '18',
+        image:
+          'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
+        usd: '10000.00',
+      },
+    },
+    id: 'f4ef0b7f-5612-537f-9144-0b5c63ae5391',
+    trigger_id: 'd73df14d-ce73-4f38-bad3-ab028154042c',
+    tx_hash:
+      '0xe6d210d2e601ef3dd1075c48e71452cf35f2daae3886911e964e3babad8ac657',
+    unread: true,
+  };
+
+  return mockNotification;
+}
+
+export function createMockRawOnChainNotifications(): OnChainRawNotification[] {
+  return [1, 2, 3].map((id) => {
+    const notification = createMockNotificationEthSent();
+    notification.id += `-${id}`;
+    return notification;
+  });
+}
diff --git a/app/scripts/controllers/metamask-notifications/processors/process-feature-announcement.test.ts b/app/scripts/controllers/metamask-notifications/processors/process-feature-announcement.test.ts
new file mode 100644
index 000000000000..673610aef7eb
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/processors/process-feature-announcement.test.ts
@@ -0,0 +1,52 @@
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import { createMockFeatureAnnouncementRaw } from '../mocks/mock-feature-announcements';
+import {
+  isFeatureAnnouncementRead,
+  processFeatureAnnouncement,
+} from './process-feature-announcement';
+
+describe('process-feature-announcement - isFeatureAnnouncementRead()', () => {
+  const MOCK_NOTIFICATION_ID = 'MOCK_NOTIFICATION_ID';
+
+  test('Returns true if a given notificationId is within list of read platform notifications', () => {
+    const notification = {
+      id: MOCK_NOTIFICATION_ID,
+      createdAt: new Date().toString(),
+    };
+
+    const result1 = isFeatureAnnouncementRead(notification, [
+      'id-1',
+      'id-2',
+      MOCK_NOTIFICATION_ID,
+    ]);
+    expect(result1).toBe(true);
+
+    const result2 = isFeatureAnnouncementRead(notification, ['id-1', 'id-2']);
+    expect(result2).toBe(false);
+  });
+
+  test('Returns isRead if notification is older than 30 days', () => {
+    const mockDate = new Date();
+    mockDate.setDate(mockDate.getDate() - 31);
+
+    const notification = {
+      id: MOCK_NOTIFICATION_ID,
+      createdAt: mockDate.toString(),
+    };
+
+    const result = isFeatureAnnouncementRead(notification, []);
+    expect(result).toBe(true);
+  });
+});
+
+describe('process-feature-announcement - processFeatureAnnouncement()', () => {
+  test('Processes a Raw Feature Announcement to a shared Notification Type', () => {
+    const rawNotification = createMockFeatureAnnouncementRaw();
+    const result = processFeatureAnnouncement(rawNotification);
+
+    expect(result.id).toBe(rawNotification.data.id);
+    expect(result.type).toBe(TRIGGER_TYPES.FEATURES_ANNOUNCEMENT);
+    expect(result.isRead).toBe(false);
+    expect(result.data).toBeDefined();
+  });
+});
diff --git a/app/scripts/controllers/metamask-notifications/processors/process-feature-announcement.ts b/app/scripts/controllers/metamask-notifications/processors/process-feature-announcement.ts
new file mode 100644
index 000000000000..a350ddedd4cc
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/processors/process-feature-announcement.ts
@@ -0,0 +1,32 @@
+import type { FeatureAnnouncementRawNotification } from '../types/feature-announcement/feature-announcement';
+import type { Notification } from '../types/notification/notification';
+
+const ONE_DAY_MS = 1000 * 60 * 60 * 24;
+
+function isThirtyDaysOld(oldDate: Date) {
+  const differenceInTime = Date.now() - oldDate.getTime();
+  const differenceInDays = differenceInTime / ONE_DAY_MS;
+  return differenceInDays >= 30;
+}
+
+export function isFeatureAnnouncementRead(
+  notification: Pick<Notification, 'id' | 'createdAt'>,
+  readPlatformNotificationsList: string[],
+): boolean {
+  if (readPlatformNotificationsList.includes(notification.id)) {
+    return true;
+  }
+  return isThirtyDaysOld(new Date(notification.createdAt));
+}
+
+export function processFeatureAnnouncement(
+  notification: FeatureAnnouncementRawNotification,
+): Notification {
+  return {
+    type: notification.type,
+    id: notification.data.id,
+    createdAt: new Date(notification.createdAt).toISOString(),
+    data: notification.data,
+    isRead: false,
+  };
+}
diff --git a/app/scripts/controllers/metamask-notifications/processors/process-notifications.test.ts b/app/scripts/controllers/metamask-notifications/processors/process-notifications.test.ts
new file mode 100644
index 000000000000..c1ed0c03b67e
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/processors/process-notifications.test.ts
@@ -0,0 +1,27 @@
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import { createMockFeatureAnnouncementRaw } from '../mocks/mock-feature-announcements';
+import { createMockNotificationEthSent } from '../mocks/mock-raw-notifications';
+import { processNotification } from './process-notifications';
+
+describe('process-notifications - processNotification()', () => {
+  // More thorough tests are found in the specific process
+  test('Maps Feature Announcement to shared Notification Type', () => {
+    const result = processNotification(createMockFeatureAnnouncementRaw());
+    expect(result).toBeDefined();
+  });
+
+  // More thorough tests are found in the specific process
+  test('Maps On Chain Notification to shared Notification Type', () => {
+    const result = processNotification(createMockNotificationEthSent());
+    expect(result).toBeDefined();
+  });
+
+  test('Throws on invalid notification to process', () => {
+    const rawNotification = createMockNotificationEthSent();
+
+    // Testing Mock with invalid notification type
+    rawNotification.type = 'FAKE_NOTIFICATION_TYPE' as TRIGGER_TYPES.ETH_SENT;
+
+    expect(() => processNotification(rawNotification)).toThrow();
+  });
+});
diff --git a/app/scripts/controllers/metamask-notifications/processors/process-notifications.ts b/app/scripts/controllers/metamask-notifications/processors/process-notifications.ts
new file mode 100644
index 000000000000..b6c618b190d3
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/processors/process-notifications.ts
@@ -0,0 +1,38 @@
+import type { Notification } from '../types/notification/notification';
+import type { OnChainRawNotification } from '../types/on-chain-notification/on-chain-notification';
+import type { FeatureAnnouncementRawNotification } from '../types/feature-announcement/feature-announcement';
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import { processOnChainNotification } from './process-onchain-notifications';
+import {
+  isFeatureAnnouncementRead,
+  processFeatureAnnouncement,
+} from './process-feature-announcement';
+
+const isOnChainNotification = (
+  n: OnChainRawNotification,
+): n is OnChainRawNotification => Object.values(TRIGGER_TYPES).includes(n.type);
+
+export function processNotification(
+  notification: FeatureAnnouncementRawNotification | OnChainRawNotification,
+  readNotifications: string[] = [],
+): Notification {
+  const exhaustedAllCases = (_: never) => {
+    throw new Error(
+      `No processor found for notification kind ${notification.type}`,
+    );
+  };
+
+  if (notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT) {
+    const n = processFeatureAnnouncement(
+      notification as FeatureAnnouncementRawNotification,
+    );
+    n.isRead = isFeatureAnnouncementRead(n, readNotifications);
+    return n;
+  }
+
+  if (isOnChainNotification(notification as OnChainRawNotification)) {
+    return processOnChainNotification(notification as OnChainRawNotification);
+  }
+
+  return exhaustedAllCases(notification as never);
+}
diff --git a/app/scripts/controllers/metamask-notifications/processors/process-onchain-notifications.test.ts b/app/scripts/controllers/metamask-notifications/processors/process-onchain-notifications.test.ts
new file mode 100644
index 000000000000..cd2159a9fb01
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/processors/process-onchain-notifications.test.ts
@@ -0,0 +1,52 @@
+import {
+  createMockNotificationEthSent,
+  createMockNotificationEthReceived,
+  createMockNotificationERC20Sent,
+  createMockNotificationERC20Received,
+  createMockNotificationERC721Sent,
+  createMockNotificationERC721Received,
+  createMockNotificationERC1155Sent,
+  createMockNotificationERC1155Received,
+  createMockNotificationMetaMaskSwapsCompleted,
+  createMockNotificationRocketPoolStakeCompleted,
+  createMockNotificationRocketPoolUnStakeCompleted,
+  createMockNotificationLidoStakeCompleted,
+  createMockNotificationLidoWithdrawalRequested,
+  createMockNotificationLidoWithdrawalCompleted,
+  createMockNotificationLidoReadyToBeWithdrawn,
+} from '../mocks/mock-raw-notifications';
+import { OnChainRawNotification } from '../types/on-chain-notification/on-chain-notification';
+import { processOnChainNotification } from './process-onchain-notifications';
+
+const rawNotifications = [
+  createMockNotificationEthSent(),
+  createMockNotificationEthReceived(),
+  createMockNotificationERC20Sent(),
+  createMockNotificationERC20Received(),
+  createMockNotificationERC721Sent(),
+  createMockNotificationERC721Received(),
+  createMockNotificationERC1155Sent(),
+  createMockNotificationERC1155Received(),
+  createMockNotificationMetaMaskSwapsCompleted(),
+  createMockNotificationRocketPoolStakeCompleted(),
+  createMockNotificationRocketPoolUnStakeCompleted(),
+  createMockNotificationLidoStakeCompleted(),
+  createMockNotificationLidoWithdrawalRequested(),
+  createMockNotificationLidoWithdrawalCompleted(),
+  createMockNotificationLidoReadyToBeWithdrawn(),
+];
+
+const rawNotificationTestSuite = rawNotifications.map(
+  (n): [string, OnChainRawNotification] => [n.type, n],
+);
+
+describe('process-onchain-notifications - processOnChainNotification()', () => {
+  test.each(rawNotificationTestSuite)(
+    'Converts Raw On-Chain Notification (%s) to a shared Notification Type',
+    (_, rawNotification) => {
+      const result = processOnChainNotification(rawNotification);
+      expect(result.id).toBe(rawNotification.id);
+      expect(result.type).toBe(rawNotification.type);
+    },
+  );
+});
diff --git a/app/scripts/controllers/metamask-notifications/processors/process-onchain-notifications.ts b/app/scripts/controllers/metamask-notifications/processors/process-onchain-notifications.ts
new file mode 100644
index 000000000000..793bfb1b1f6f
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/processors/process-onchain-notifications.ts
@@ -0,0 +1,13 @@
+import type { OnChainRawNotification } from '../types/on-chain-notification/on-chain-notification';
+import type { Notification } from '../types/notification/notification';
+
+export function processOnChainNotification(
+  notification: OnChainRawNotification,
+): Notification {
+  return {
+    ...notification,
+    id: notification.id,
+    createdAt: new Date(notification.created_at).toISOString(),
+    isRead: !notification.unread,
+  };
+}
diff --git a/app/scripts/controllers/metamask-notifications/services/feature-announcements.test.ts b/app/scripts/controllers/metamask-notifications/services/feature-announcements.test.ts
new file mode 100644
index 000000000000..ea000423db0c
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/services/feature-announcements.test.ts
@@ -0,0 +1,62 @@
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import {
+  createMockFeatureAnnouncementAPIResult,
+  mockFetchFeatureAnnouncementNotifications,
+} from '../mocks/mock-feature-announcements';
+import { getFeatureAnnouncementNotifications } from './feature-announcements';
+
+jest.mock('@contentful/rich-text-html-renderer', () => ({
+  documentToHtmlString: jest
+    .fn()
+    .mockImplementation((richText) => `<p>${richText}</p>`),
+}));
+
+describe('Feature Announcement Notifications', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return an empty array if fetch fails', async () => {
+    const mockEndpoint = mockFetchFeatureAnnouncementNotifications({
+      status: 500,
+    });
+
+    const notifications = await getFeatureAnnouncementNotifications();
+    mockEndpoint.done();
+    expect(notifications).toEqual([]);
+  });
+
+  it('should return an empty array if data is not available', async () => {
+    const mockEndpoint = mockFetchFeatureAnnouncementNotifications({
+      status: 200,
+      body: { items: [] },
+    });
+
+    const notifications = await getFeatureAnnouncementNotifications();
+    mockEndpoint.done();
+    expect(notifications).toEqual([]);
+  });
+
+  it('should fetch entries from Contentful and return formatted notifications', async () => {
+    const mockEndpoint = mockFetchFeatureAnnouncementNotifications({
+      status: 200,
+      body: createMockFeatureAnnouncementAPIResult(),
+    });
+
+    const notifications = await getFeatureAnnouncementNotifications();
+    expect(notifications).toHaveLength(1);
+    mockEndpoint.done();
+
+    const resultNotification = notifications[0];
+    expect(resultNotification).toEqual(
+      expect.objectContaining({
+        id: 'dont-miss-out-on-airdrops-and-new-nft-mints',
+        type: TRIGGER_TYPES.FEATURES_ANNOUNCEMENT,
+        createdAt: expect.any(String),
+        isRead: expect.any(Boolean),
+      }),
+    );
+
+    expect(resultNotification.data).toBeDefined();
+  });
+});
diff --git a/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts b/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
new file mode 100644
index 000000000000..af85fbef5750
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
@@ -0,0 +1,129 @@
+import { documentToHtmlString } from '@contentful/rich-text-html-renderer';
+import log from 'loglevel';
+import type { Entry, Asset } from 'contentful';
+import type {
+  FeatureAnnouncementRawNotification,
+  TypeFeatureAnnouncement,
+} from '../types/feature-announcement/feature-announcement';
+import type { Notification } from '../types/notification/notification';
+import { processFeatureAnnouncement } from '../processors/process-feature-announcement';
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import { ImageFields } from '../types/feature-announcement/type-feature-announcement';
+import { TypeLinkFields } from '../types/feature-announcement/type-link';
+import { TypeActionFields } from '../types/feature-announcement/type-action';
+
+const spaceId = process.env.CONTENTFUL_ACCESS_SPACE_ID || '';
+const accessToken = process.env.CONTENTFUL_ACCESS_TOKEN || '';
+export const FEATURE_ANNOUNCEMENT_URL = `https://cdn.contentful.com/spaces/${spaceId}/environments/master/entries?access_token=${accessToken}&content_type=productAnnouncement&include=10`;
+
+export type ContentfulResult = {
+  includes?: {
+    Entry?: Entry[];
+    Asset?: Asset[];
+  };
+  items?: TypeFeatureAnnouncement[];
+};
+
+async function fetchFromContentful(
+  url: string,
+  retries = 3,
+  retryDelay = 1000,
+): Promise<ContentfulResult | null> {
+  let lastError: Error | null = null;
+
+  for (let i = 0; i < retries; i++) {
+    try {
+      const response = await fetch(url);
+      if (!response.ok) {
+        throw new Error(`Fetch failed with status: ${response.status}`);
+      }
+      return await response.json();
+    } catch (error) {
+      if (error instanceof Error) {
+        lastError = error;
+      }
+      if (i < retries - 1) {
+        await new Promise((resolve) => setTimeout(resolve, retryDelay));
+      }
+    }
+  }
+
+  log.error(
+    `Error fetching from Contentful after ${retries} retries: ${lastError}`,
+  );
+  return null;
+}
+
+async function fetchFeatureAnnouncementNotifications(): Promise<
+  FeatureAnnouncementRawNotification[]
+> {
+  const data = await fetchFromContentful(FEATURE_ANNOUNCEMENT_URL);
+
+  if (!data) {
+    return [];
+  }
+
+  const findIncludedItem = (sysId: string) => {
+    const item =
+      data?.includes?.Entry?.find((i: Entry) => i?.sys?.id === sysId) ||
+      data?.includes?.Asset?.find((i: Asset) => i?.sys?.id === sysId);
+    return item ? item?.fields : null;
+  };
+
+  const contentfulNotifications = data?.items ?? [];
+  const rawNotifications: FeatureAnnouncementRawNotification[] =
+    contentfulNotifications.map((n: TypeFeatureAnnouncement) => {
+      const { fields } = n;
+      const imageFields = fields.image
+        ? (findIncludedItem(fields.image.sys.id) as ImageFields['fields'])
+        : undefined;
+      const actionFields = fields.action
+        ? (findIncludedItem(fields.action.sys.id) as TypeActionFields['fields'])
+        : undefined;
+      const linkFields = fields.link
+        ? (findIncludedItem(fields.link.sys.id) as TypeLinkFields['fields'])
+        : undefined;
+
+      const notification: FeatureAnnouncementRawNotification = {
+        type: TRIGGER_TYPES.FEATURES_ANNOUNCEMENT,
+        createdAt: new Date(n.sys.createdAt).toString(),
+        data: {
+          id: fields.id,
+          category: fields.category,
+          title: fields.title,
+          longDescription: documentToHtmlString(fields.longDescription),
+          shortDescription: fields.shortDescription,
+          image: {
+            title: imageFields?.title,
+            description: imageFields?.description,
+            url: imageFields?.file?.url ?? '',
+          },
+          link: linkFields && {
+            linkText: linkFields?.linkText,
+            linkUrl: linkFields?.linkUrl,
+            isExternal: linkFields?.isExternal,
+          },
+          action: actionFields && {
+            actionText: actionFields?.actionText,
+            actionUrl: actionFields?.actionUrl,
+            isExternal: actionFields?.isExternal,
+          },
+        },
+      };
+
+      return notification;
+    });
+
+  return rawNotifications;
+}
+
+export async function getFeatureAnnouncementNotifications(): Promise<
+  Notification[]
+> {
+  const rawNotifications = await fetchFeatureAnnouncementNotifications();
+  const notifications = rawNotifications.map((notification) =>
+    processFeatureAnnouncement(notification),
+  );
+
+  return notifications;
+}
diff --git a/app/scripts/controllers/metamask-notifications/services/onchain-notifications.test.ts b/app/scripts/controllers/metamask-notifications/services/onchain-notifications.test.ts
new file mode 100644
index 000000000000..3ee5b311a9f7
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/services/onchain-notifications.test.ts
@@ -0,0 +1,278 @@
+import { TRIGGER_TYPES } from '../constants/notification-schema';
+import {
+  mockBatchCreateTriggers,
+  mockBatchDeleteTriggers,
+  mockListNotifications,
+  mockMarkNotificationsAsRead,
+} from '../mocks/mock-onchain-notifications';
+import {
+  MOCK_USER_STORAGE_ACCOUNT,
+  MOCK_USER_STORAGE_CHAIN,
+  createMockUserStorageWithTriggers,
+} from '../mocks/mock-notification-user-storage';
+import { UserStorage } from '../types/user-storage/user-storage';
+import * as MetamaskNotificationsUtils from '../utils/utils';
+import * as OnChainNotifications from './onchain-notifications';
+
+const MOCK_STORAGE_KEY = 'MOCK_USER_STORAGE_KEY';
+const MOCK_BEARER_TOKEN = 'MOCK_BEARER_TOKEN';
+const MOCK_TRIGGER_ID = 'TRIGGER_ID_1';
+
+describe('On Chain Notifications - createOnChainTriggers()', () => {
+  test('Should create new triggers', async () => {
+    const mocks = arrangeMocks();
+
+    // The initial trigger to create should not be enabled
+    assertUserStorageTriggerStatus(mocks.mockUserStorage, false);
+
+    await OnChainNotifications.createOnChainTriggers(
+      mocks.mockUserStorage,
+      MOCK_STORAGE_KEY,
+      MOCK_BEARER_TOKEN,
+      mocks.triggers,
+    );
+
+    mocks.mockEndpoint.done();
+
+    // once we created triggers, we expect the trigger to be enabled
+    assertUserStorageTriggerStatus(mocks.mockUserStorage, true);
+  });
+
+  test('Does not call endpoint if there are no triggers to create', async () => {
+    const mocks = arrangeMocks();
+    await OnChainNotifications.createOnChainTriggers(
+      mocks.mockUserStorage,
+      MOCK_STORAGE_KEY,
+      MOCK_BEARER_TOKEN,
+      [], // there are no triggers we've provided that need to be created
+    );
+
+    expect(mocks.mockEndpoint.isDone()).toBe(false);
+  });
+
+  test('Should throw error if endpoint fails', async () => {
+    const mockUserStorage = createMockUserStorageWithTriggers([
+      { id: MOCK_TRIGGER_ID, k: TRIGGER_TYPES.ETH_SENT, e: false },
+    ]);
+    const triggers =
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(mockUserStorage);
+    const mockBadEndpoint = mockBatchCreateTriggers({
+      status: 500,
+      body: { error: 'mock api failure' },
+    });
+
+    // The initial trigger to create should not be enabled
+    assertUserStorageTriggerStatus(mockUserStorage, false);
+
+    await expect(
+      OnChainNotifications.createOnChainTriggers(
+        mockUserStorage,
+        MOCK_STORAGE_KEY,
+        MOCK_BEARER_TOKEN,
+        triggers,
+      ),
+    ).rejects.toThrow();
+
+    mockBadEndpoint.done();
+
+    // since failed, expect triggers to not be enabled
+    assertUserStorageTriggerStatus(mockUserStorage, false);
+  });
+
+  function assertUserStorageTriggerStatus(
+    userStorage: UserStorage,
+    enabled: boolean,
+  ) {
+    expect(
+      userStorage[MOCK_USER_STORAGE_ACCOUNT][MOCK_USER_STORAGE_CHAIN][
+        MOCK_TRIGGER_ID
+      ].e,
+    ).toBe(enabled);
+  }
+
+  function arrangeMocks() {
+    const mockUserStorage = createMockUserStorageWithTriggers([
+      { id: MOCK_TRIGGER_ID, k: TRIGGER_TYPES.ETH_SENT, e: false },
+    ]);
+    const triggers =
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(mockUserStorage);
+    const mockEndpoint = mockBatchCreateTriggers();
+
+    return {
+      mockUserStorage,
+      triggers,
+      mockEndpoint,
+    };
+  }
+});
+
+describe('On Chain Notifications - deleteOnChainTriggers()', () => {
+  test('Should delete a trigger from API and in user storage', async () => {
+    const { mockUserStorage, triggerId1, triggerId2 } = arrangeUserStorage();
+    const mockEndpoint = mockBatchDeleteTriggers();
+
+    // Assert that triggers exists
+    [triggerId1, triggerId2].forEach((t) => {
+      expect(getTriggerFromUserStorage(mockUserStorage, t)).toBeDefined();
+    });
+
+    await OnChainNotifications.deleteOnChainTriggers(
+      mockUserStorage,
+      MOCK_STORAGE_KEY,
+      MOCK_BEARER_TOKEN,
+      [triggerId2],
+    );
+
+    mockEndpoint.done();
+
+    // Assert trigger deletion
+    expect(
+      getTriggerFromUserStorage(mockUserStorage, triggerId1),
+    ).toBeDefined();
+    expect(
+      getTriggerFromUserStorage(mockUserStorage, triggerId2),
+    ).toBeUndefined();
+  });
+
+  test('Should delete all triggers and account in user storage', async () => {
+    const { mockUserStorage, triggerId1, triggerId2 } = arrangeUserStorage();
+    const mockEndpoint = mockBatchDeleteTriggers();
+
+    await OnChainNotifications.deleteOnChainTriggers(
+      mockUserStorage,
+      MOCK_STORAGE_KEY,
+      MOCK_BEARER_TOKEN,
+      [triggerId1, triggerId2], // delete all triggers for an account
+    );
+
+    mockEndpoint.done();
+
+    // assert that the underlying user is also deleted since all underlying triggers are deleted
+    expect(mockUserStorage[MOCK_USER_STORAGE_ACCOUNT]).toBeUndefined();
+  });
+
+  test('Should throw error if endpoint fails to delete', async () => {
+    const { mockUserStorage, triggerId1, triggerId2 } = arrangeUserStorage();
+    const mockBadEndpoint = mockBatchDeleteTriggers({
+      status: 500,
+      body: { error: 'mock api failure' },
+    });
+
+    await expect(
+      OnChainNotifications.deleteOnChainTriggers(
+        mockUserStorage,
+        MOCK_STORAGE_KEY,
+        MOCK_BEARER_TOKEN,
+        [triggerId1, triggerId2],
+      ),
+    ).rejects.toThrow();
+
+    mockBadEndpoint.done();
+
+    // Assert that triggers were not deleted from user storage
+    [triggerId1, triggerId2].forEach((t) => {
+      expect(getTriggerFromUserStorage(mockUserStorage, t)).toBeDefined();
+    });
+  });
+
+  function getTriggerFromUserStorage(
+    userStorage: UserStorage,
+    triggerId: string,
+  ) {
+    return userStorage[MOCK_USER_STORAGE_ACCOUNT][MOCK_USER_STORAGE_CHAIN][
+      triggerId
+    ];
+  }
+
+  function arrangeUserStorage() {
+    const triggerId1 = 'TRIGGER_ID_1';
+    const triggerId2 = 'TRIGGER_ID_2';
+    const mockUserStorage = createMockUserStorageWithTriggers([
+      triggerId1,
+      triggerId2,
+    ]);
+
+    return {
+      mockUserStorage,
+      triggerId1,
+      triggerId2,
+    };
+  }
+});
+
+describe('On Chain Notifications - getOnChainNotifications()', () => {
+  test('Should return a list of notifications', async () => {
+    const mockEndpoint = mockListNotifications();
+    const mockUserStorage = createMockUserStorageWithTriggers([
+      'trigger_1',
+      'trigger_2',
+    ]);
+
+    const result = await OnChainNotifications.getOnChainNotifications(
+      mockUserStorage,
+      MOCK_BEARER_TOKEN,
+    );
+
+    mockEndpoint.done();
+    expect(result.length > 0).toBe(true);
+  });
+
+  test('Should return an empty list if not triggers found in user storage', async () => {
+    const mockEndpoint = mockListNotifications();
+    const mockUserStorage = createMockUserStorageWithTriggers([]); // no triggers
+
+    const result = await OnChainNotifications.getOnChainNotifications(
+      mockUserStorage,
+      MOCK_BEARER_TOKEN,
+    );
+
+    expect(mockEndpoint.isDone()).toBe(false);
+    expect(result.length === 0).toBe(true);
+  });
+
+  test('Should return an empty list of notifications if endpoint fails to fetch triggers', async () => {
+    const mockEndpoint = mockListNotifications({
+      status: 500,
+      body: { error: 'mock api failure' },
+    });
+    const mockUserStorage = createMockUserStorageWithTriggers([
+      'trigger_1',
+      'trigger_2',
+    ]);
+
+    const result = await OnChainNotifications.getOnChainNotifications(
+      mockUserStorage,
+      MOCK_BEARER_TOKEN,
+    );
+
+    mockEndpoint.done();
+    expect(result.length === 0).toBe(true);
+  });
+});
+
+describe('On Chain Notifications - markNotificationsAsRead()', () => {
+  test('Should successfully call endpoint to mark notifications as read', async () => {
+    const mockEndpoint = mockMarkNotificationsAsRead();
+    await OnChainNotifications.markNotificationsAsRead(MOCK_BEARER_TOKEN, [
+      'notification_1',
+      'notification_2',
+    ]);
+
+    mockEndpoint.done();
+  });
+
+  test('Should throw error if fails to call endpoint to mark notifications as read', async () => {
+    const mockBadEndpoint = mockMarkNotificationsAsRead({
+      status: 500,
+      body: { error: 'mock api failure' },
+    });
+    await expect(
+      OnChainNotifications.markNotificationsAsRead(MOCK_BEARER_TOKEN, [
+        'notification_1',
+        'notification_2',
+      ]),
+    ).rejects.toThrow();
+
+    mockBadEndpoint.done();
+  });
+});
diff --git a/app/scripts/controllers/metamask-notifications/services/onchain-notifications.ts b/app/scripts/controllers/metamask-notifications/services/onchain-notifications.ts
new file mode 100644
index 000000000000..3012352c7f49
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/services/onchain-notifications.ts
@@ -0,0 +1,288 @@
+import log from 'loglevel';
+import type { UserStorage } from '../types/user-storage/user-storage';
+import type { OnChainRawNotification } from '../types/on-chain-notification/on-chain-notification';
+import {
+  traverseUserStorageTriggers,
+  toggleUserStorageTriggerStatus,
+  makeApiCall,
+} from '../utils/utils';
+import type { TRIGGER_TYPES } from '../constants/notification-schema';
+import type { components } from '../types/on-chain-notification/schema';
+import { createSHA256Hash } from '../../user-storage/encryption';
+
+export type NotificationTrigger = {
+  id: string;
+  chainId: string;
+  kind: string;
+  address: string;
+};
+
+export const TRIGGER_API = process.env.TRIGGERS_SERVICE_URL;
+export const NOTIFICATION_API = process.env.NOTIFICATIONS_SERVICE_URL;
+export const TRIGGER_API_BATCH_ENDPOINT = `${TRIGGER_API}/api/v1/triggers/batch`;
+export const NOTIFICATION_API_LIST_ENDPOINT = `${NOTIFICATION_API}/api/v1/notifications`;
+export const NOTIFICATION_API_LIST_ENDPOINT_PAGE_QUERY = (page: number) =>
+  `${NOTIFICATION_API_LIST_ENDPOINT}?page=${page}&per_page=100`;
+export const NOTIFICATION_API_MARK_ALL_AS_READ_ENDPOINT = `${NOTIFICATION_API}/api/v1/notifications/mark-as-read`;
+
+/**
+ * Creates on-chain triggers based on the provided notification triggers.
+ * This method generates a unique token for each trigger using the trigger ID and storage key,
+ * proving ownership of the trigger being updated. It then makes an API call to create these triggers.
+ * Upon successful creation, it updates the userStorage to reflect the new trigger status.
+ *
+ * @param userStorage - The user's storage object where triggers and their statuses are stored.
+ * @param storageKey - A key used along with the trigger ID to generate a unique token for each trigger.
+ * @param bearerToken - The JSON Web Token used for authentication in the API call.
+ * @param triggers - An array of notification triggers to be created. Each trigger includes an ID, chain ID, kind, and address.
+ * @returns A promise that resolves to void. Throws an error if the API call fails or if there's an issue creating the triggers.
+ */
+export async function createOnChainTriggers(
+  userStorage: UserStorage,
+  storageKey: string,
+  bearerToken: string,
+  triggers: NotificationTrigger[],
+): Promise<void> {
+  type RequestPayloadTrigger = {
+    id: string;
+    // this is the trigger token, generated by using the uuid + storage key. It proves you own the trigger you are updating
+    token: string;
+    config: {
+      kind: string;
+      chain_id: number;
+      address: string;
+    };
+  };
+  const triggersToCreate: RequestPayloadTrigger[] = triggers.map((t) => ({
+    id: t.id,
+    token: createSHA256Hash(t.id + storageKey),
+    config: {
+      kind: t.kind,
+      chain_id: Number(t.chainId),
+      address: t.address,
+    },
+  }));
+
+  if (triggersToCreate.length === 0) {
+    return;
+  }
+
+  const response = await makeApiCall(
+    bearerToken,
+    TRIGGER_API_BATCH_ENDPOINT,
+    'POST',
+    triggersToCreate,
+  );
+
+  if (!response.ok) {
+    const errorData = await response.json().catch(() => undefined);
+    log.error('Error creating triggers:', errorData);
+    throw new Error('OnChain Notifications - unable to create triggers');
+  }
+
+  // If the trigger creation was fine
+  // then update the userStorage
+  for (const trigger of triggersToCreate) {
+    toggleUserStorageTriggerStatus(
+      userStorage,
+      trigger.config.address,
+      String(trigger.config.chain_id),
+      trigger.id,
+      true,
+    );
+  }
+}
+
+/**
+ * Deletes on-chain triggers based on the provided UUIDs.
+ * This method generates a unique token for each trigger using the UUID and storage key,
+ * proving ownership of the trigger being deleted. It then makes an API call to delete these triggers.
+ * Upon successful deletion, it updates the userStorage to remove the deleted trigger statuses.
+ *
+ * @param userStorage - The user's storage object where triggers and their statuses are stored.
+ * @param storageKey - A key used along with the UUID to generate a unique token for each trigger.
+ * @param bearerToken - The JSON Web Token used for authentication in the API call.
+ * @param uuids - An array of UUIDs representing the triggers to be deleted.
+ * @returns A promise that resolves to the updated UserStorage object. Throws an error if the API call fails or if there's an issue deleting the triggers.
+ */
+export async function deleteOnChainTriggers(
+  userStorage: UserStorage,
+  storageKey: string,
+  bearerToken: string,
+  uuids: string[],
+): Promise<UserStorage> {
+  const triggersToDelete = uuids.map((uuid) => ({
+    id: uuid,
+    token: createSHA256Hash(uuid + storageKey),
+  }));
+
+  try {
+    const response = await makeApiCall(
+      bearerToken,
+      TRIGGER_API_BATCH_ENDPOINT,
+      'DELETE',
+      triggersToDelete,
+    );
+
+    if (!response.ok) {
+      throw new Error(
+        `Failed to delete on-chain notifications for uuids ${uuids.join(', ')}`,
+      );
+    }
+
+    // Update the state of the deleted trigger to false
+    for (const uuid of uuids) {
+      for (const address in userStorage) {
+        if (Object.hasOwn(userStorage, address)) {
+          for (const chainId in userStorage[address]) {
+            if (userStorage?.[address]?.[chainId]?.[uuid]) {
+              delete userStorage[address][chainId][uuid];
+            }
+          }
+        }
+      }
+    }
+
+    // Follow-up cleanup, if an address had no triggers whatsoever, then we can delete the address
+    const isEmpty = (obj = {}) => Object.keys(obj).length === 0;
+    for (const address in userStorage) {
+      if (Object.hasOwn(userStorage, address)) {
+        for (const chainId in userStorage[address]) {
+          // Chain isEmpty Check
+          if (isEmpty(userStorage?.[address]?.[chainId])) {
+            delete userStorage[address][chainId];
+          }
+        }
+
+        // Address isEmpty Check
+        if (isEmpty(userStorage?.[address])) {
+          delete userStorage[address];
+        }
+      }
+    }
+  } catch (err) {
+    log.error(
+      `Error deleting on-chain notifications for uuids ${uuids.join(', ')}:`,
+      err,
+    );
+    throw err;
+  }
+
+  return userStorage;
+}
+
+/**
+ * Fetches on-chain notifications for the given user storage and BearerToken.
+ * This method iterates through the userStorage to find enabled triggers and fetches notifications for those triggers.
+ * It makes paginated API calls to the notifications service, transforming and aggregating the notifications into a single array.
+ * The process stops either when all pages have been fetched or when a page has less than 100 notifications, indicating the end of the data.
+ *
+ * @param userStorage - The user's storage object containing trigger information.
+ * @param bearerToken - The JSON Web Token used for authentication in the API call.
+ * @returns A promise that resolves to an array of OnChainRawNotification objects. If no triggers are enabled or an error occurs, it may return an empty array.
+ */
+export async function getOnChainNotifications(
+  userStorage: UserStorage,
+  bearerToken: string,
+): Promise<OnChainRawNotification[]> {
+  const triggerIds = traverseUserStorageTriggers(userStorage, {
+    mapTrigger: (t) => {
+      if (!t.enabled) {
+        return undefined;
+      }
+      return t.id;
+    },
+  });
+
+  if (triggerIds.length === 0) {
+    return [];
+  }
+
+  const onChainNotifications: OnChainRawNotification[] = [];
+  const PAGE_LIMIT = 2;
+  for (let page = 1; page <= PAGE_LIMIT; page++) {
+    try {
+      const response = await makeApiCall(
+        bearerToken,
+        NOTIFICATION_API_LIST_ENDPOINT_PAGE_QUERY(page),
+        'POST',
+        { trigger_ids: triggerIds },
+      );
+
+      const notifications = (await response.json()) as OnChainRawNotification[];
+
+      // Transform and sort notifications
+      const transformedNotifications = notifications
+        .map(
+          (
+            n: components['schemas']['Notification'],
+          ): OnChainRawNotification | undefined => {
+            if (!n.data?.kind) {
+              return undefined;
+            }
+
+            return {
+              ...n,
+              type: n.data.kind as TRIGGER_TYPES,
+            } as OnChainRawNotification;
+          },
+        )
+        .filter((n): n is OnChainRawNotification => Boolean(n));
+
+      onChainNotifications.push(...transformedNotifications);
+
+      // if less than 100 notifications on page, then means we reached end
+      if (notifications.length < 100) {
+        page = PAGE_LIMIT + 1;
+        break;
+      }
+    } catch (err) {
+      log.error(
+        `Error fetching on-chain notifications for trigger IDs ${triggerIds.join(
+          ', ',
+        )}:`,
+        err,
+      );
+      // do nothing
+    }
+  }
+
+  return onChainNotifications;
+}
+
+/**
+ * Marks the specified notifications as read.
+ * This method sends a POST request to the notifications service to mark the provided notification IDs as read.
+ * If the operation is successful, it completes without error. If the operation fails, it throws an error with details.
+ *
+ * @param bearerToken - The JSON Web Token used for authentication in the API call.
+ * @param notificationIds - An array of notification IDs to be marked as read.
+ * @returns A promise that resolves to void. The promise will reject if there's an error during the API call or if the response status is not 200.
+ */
+export async function markNotificationsAsRead(
+  bearerToken: string,
+  notificationIds: string[],
+): Promise<void> {
+  if (notificationIds.length === 0) {
+    return;
+  }
+
+  try {
+    const response = await makeApiCall(
+      bearerToken,
+      NOTIFICATION_API_MARK_ALL_AS_READ_ENDPOINT,
+      'POST',
+      { ids: notificationIds },
+    );
+
+    if (response.status !== 200) {
+      const errorData = await response.json().catch(() => undefined);
+      throw new Error(
+        `Error marking notifications as read: ${errorData?.message}`,
+      );
+    }
+  } catch (err) {
+    log.error('Error marking notifications as read:', err);
+    throw err;
+  }
+}
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/feature-announcement.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/feature-announcement.ts
new file mode 100644
index 000000000000..4141dab2618a
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/feature-announcement/feature-announcement.ts
@@ -0,0 +1,33 @@
+import type { TRIGGER_TYPES } from '../../constants/notification-schema';
+import type { TypeFeatureAnnouncement } from './type-feature-announcement';
+
+export type { TypeFeatureAnnouncement };
+export type { TypeFeatureAnnouncementFields } from './type-feature-announcement';
+
+export type FeatureAnnouncementRawNotificationData = Omit<
+  TypeFeatureAnnouncement['fields'],
+  'image' | 'longDescription' | 'link' | 'action'
+> & {
+  longDescription: string;
+  image: {
+    title?: string;
+    description?: string;
+    url: string;
+  };
+  link?: {
+    linkText: string;
+    linkUrl: string;
+    isExternal: boolean;
+  };
+  action?: {
+    actionText: string;
+    actionUrl: string;
+    isExternal: boolean;
+  };
+};
+
+export type FeatureAnnouncementRawNotification = {
+  type: TRIGGER_TYPES.FEATURES_ANNOUNCEMENT;
+  createdAt: string;
+  data: FeatureAnnouncementRawNotificationData;
+};
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-action.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-action.ts
new file mode 100644
index 000000000000..453bd5d9b206
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-action.ts
@@ -0,0 +1,12 @@
+import type { Entry } from 'contentful';
+
+export type TypeActionFields = {
+  fields: {
+    actionText: string;
+    actionUrl: string;
+    isExternal: boolean;
+  };
+  contentTypeId: 'action';
+};
+
+export type TypeAction = Entry<TypeActionFields, 'WITHOUT_UNRESOLVABLE_LINKS'>;
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-feature-announcement.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-feature-announcement.ts
new file mode 100644
index 000000000000..e93e577b2600
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-feature-announcement.ts
@@ -0,0 +1,42 @@
+import type { Entry, EntryFieldTypes } from 'contentful';
+import type { TypeActionFields } from './type-action';
+import type { TypeLinkFields } from './type-link';
+
+export type ImageFields = {
+  fields: {
+    title?: string;
+    description?: string;
+    file?: {
+      url: string;
+      fileName: string;
+      contentType: string;
+      details: {
+        size: number;
+        image?: {
+          width: number;
+          height: number;
+        };
+      };
+    };
+  };
+  contentTypeId: 'Image';
+};
+
+export type TypeFeatureAnnouncementFields = {
+  fields: {
+    title: EntryFieldTypes.Text;
+    id: EntryFieldTypes.Symbol;
+    category: EntryFieldTypes.Text; // E.g. Announcement, etc.
+    shortDescription: EntryFieldTypes.Text;
+    image: EntryFieldTypes.EntryLink<ImageFields>;
+    longDescription: EntryFieldTypes.RichText;
+    link?: EntryFieldTypes.EntryLink<TypeLinkFields>;
+    action?: EntryFieldTypes.EntryLink<TypeActionFields>;
+  };
+  contentTypeId: 'productAnnouncement';
+};
+
+export type TypeFeatureAnnouncement = Entry<
+  TypeFeatureAnnouncementFields,
+  'WITHOUT_UNRESOLVABLE_LINKS'
+>;
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-link.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-link.ts
new file mode 100644
index 000000000000..fec717ce9da2
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-link.ts
@@ -0,0 +1,12 @@
+import type { Entry } from 'contentful';
+
+export type TypeLinkFields = {
+  fields: {
+    linkText: string;
+    linkUrl: string;
+    isExternal: boolean;
+  };
+  contentTypeId: 'link';
+};
+
+export type TypeLink = Entry<TypeLinkFields, 'WITHOUT_UNRESOLVABLE_LINKS'>;
diff --git a/app/scripts/controllers/metamask-notifications/types/notification/notification.ts b/app/scripts/controllers/metamask-notifications/types/notification/notification.ts
new file mode 100644
index 000000000000..666e4b129a71
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/notification/notification.ts
@@ -0,0 +1,32 @@
+import type { FeatureAnnouncementRawNotification } from '../feature-announcement/feature-announcement';
+import type { OnChainRawNotification } from '../on-chain-notification/on-chain-notification';
+import type { Compute } from '../type-utils';
+
+/**
+ * The shape of a "generic" notification.
+ * Other than the fields listed below, tt will also contain:
+ * - `type` field (declared in the Raw shapes)
+ * - `data` field (declared in the Raw shapes)
+ */
+export type Notification = Compute<
+  (FeatureAnnouncementRawNotification | OnChainRawNotification) & {
+    id: string;
+    createdAt: string;
+    isRead: boolean;
+  }
+>;
+
+// NFT
+export type NFT = {
+  token_id: string;
+  image: string;
+  collection?: {
+    name: string;
+    image: string;
+  };
+};
+
+export type MarkAsReadNotificationsParam = Pick<
+  Notification,
+  'id' | 'type' | 'isRead'
+>[];
diff --git a/app/scripts/controllers/metamask-notifications/types/on-chain-notification/on-chain-notification.ts b/app/scripts/controllers/metamask-notifications/types/on-chain-notification/on-chain-notification.ts
new file mode 100644
index 000000000000..022702933bea
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/on-chain-notification/on-chain-notification.ts
@@ -0,0 +1,50 @@
+import type { TRIGGER_TYPES } from '../../constants/notification-schema';
+import type { Compute } from '../type-utils';
+import type { components } from './schema';
+
+export type Data_MetamaskSwapCompleted =
+  components['schemas']['Data_MetamaskSwapCompleted'];
+export type Data_LidoStakeReadyToBeWithdrawn =
+  components['schemas']['Data_LidoStakeReadyToBeWithdrawn'];
+export type Data_LidoStakeCompleted =
+  components['schemas']['Data_LidoStakeCompleted'];
+export type Data_LidoWithdrawalRequested =
+  components['schemas']['Data_LidoWithdrawalRequested'];
+export type Data_LidoWithdrawalCompleted =
+  components['schemas']['Data_LidoWithdrawalCompleted'];
+export type Data_RocketPoolStakeCompleted =
+  components['schemas']['Data_RocketPoolStakeCompleted'];
+export type Data_RocketPoolUnstakeCompleted =
+  components['schemas']['Data_RocketPoolUnstakeCompleted'];
+export type Data_ETHSent = components['schemas']['Data_ETHSent'];
+export type Data_ETHReceived = components['schemas']['Data_ETHReceived'];
+export type Data_ERC20Sent = components['schemas']['Data_ERC20Sent'];
+export type Data_ERC20Received = components['schemas']['Data_ERC20Received'];
+export type Data_ERC721Sent = components['schemas']['Data_ERC721Sent'];
+export type Data_ERC721Received = components['schemas']['Data_ERC721Received'];
+
+type Notification = components['schemas']['Notification'];
+type NotificationDataKinds = NonNullable<Notification['data']>['kind'];
+type ConvertToEnum<Kind> = {
+  [K in TRIGGER_TYPES]: Kind extends `${K}` ? K : never;
+}[TRIGGER_TYPES];
+
+/**
+ * Type-Computation.
+ * 1. Adds a `type` field to the notification, it converts the schema type into the ENUM we use.
+ * 2. It ensures that the `data` field is the correct Notification data for this `type`
+ * - The `Compute` utility merges the intersections (`&`) for a prettier type.
+ */
+export type OnChainRawNotification = {
+  [K in NotificationDataKinds]: Compute<
+    Omit<Notification, 'data'> & {
+      type: ConvertToEnum<K>;
+      data: Extract<Notification['data'], { kind: K }>;
+    }
+  >;
+}[NotificationDataKinds];
+
+export type OnChainRawNotificationsWithNetworkFields = Extract<
+  OnChainRawNotification,
+  { data: { network_fee: unknown } }
+>;
diff --git a/app/scripts/controllers/metamask-notifications/types/on-chain-notification/schema.d.ts b/app/scripts/controllers/metamask-notifications/types/on-chain-notification/schema.d.ts
new file mode 100644
index 000000000000..27fb46003367
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/on-chain-notification/schema.d.ts
@@ -0,0 +1,300 @@
+/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */
+
+export type paths = {
+  '/api/v1/notifications': {
+    /** List all notifications ordered by most recent */
+    post: {
+      parameters: {
+        query?: {
+          /** @description Page number for pagination */
+          page?: number;
+          /** @description Number of notifications per page for pagination */
+          per_page?: number;
+        };
+      };
+      requestBody?: {
+        content: {
+          'application/json': {
+            trigger_ids: string[];
+            chain_ids?: number[];
+            kinds?: string[];
+            unread?: boolean;
+          };
+        };
+      };
+      responses: {
+        /** @description Successfully fetched a list of notifications */
+        200: {
+          content: {
+            'application/json': components['schemas']['Notification'][];
+          };
+        };
+      };
+    };
+  };
+  '/api/v1/notifications/mark-as-read': {
+    /** Mark notifications as read */
+    post: {
+      requestBody: {
+        content: {
+          'application/json': {
+            ids?: string[];
+          };
+        };
+      };
+      responses: {
+        /** @description Successfully marked notifications as read */
+        200: {
+          content: never;
+        };
+      };
+    };
+  };
+};
+
+export type webhooks = Record<string, never>;
+
+export type components = {
+  schemas: {
+    Notification: {
+      /** Format: uuid */
+      id: string;
+      /** Format: uuid */
+      trigger_id: string;
+      /** @example 1 */
+      chain_id: number;
+      /** @example 17485840 */
+      block_number: number;
+      block_timestamp: string;
+      /**
+       * Format: address
+       *
+       * @example 0x881D40237659C251811CEC9c364ef91dC08D300C
+       */
+      tx_hash: string;
+      /** @example false */
+      unread: boolean;
+      /** Format: date-time */
+      created_at: string;
+      data?:
+        | components['schemas']['Data_MetamaskSwapCompleted']
+        | components['schemas']['Data_LidoStakeReadyToBeWithdrawn']
+        | components['schemas']['Data_LidoStakeCompleted']
+        | components['schemas']['Data_LidoWithdrawalRequested']
+        | components['schemas']['Data_LidoWithdrawalCompleted']
+        | components['schemas']['Data_RocketPoolStakeCompleted']
+        | components['schemas']['Data_RocketPoolUnstakeCompleted']
+        | components['schemas']['Data_ETHSent']
+        | components['schemas']['Data_ETHReceived']
+        | components['schemas']['Data_ERC20Sent']
+        | components['schemas']['Data_ERC20Received']
+        | components['schemas']['Data_ERC721Sent']
+        | components['schemas']['Data_ERC721Received']
+        | components['schemas']['Data_ERC1155Sent']
+        | components['schemas']['Data_ERC1155Received'];
+    };
+    Data_MetamaskSwapCompleted: {
+      /** @enum {string} */
+      kind: 'metamask_swap_completed';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: decimal */
+      rate: string;
+      token_in: components['schemas']['Token'];
+      token_out: components['schemas']['Token'];
+    };
+    Data_LidoStakeCompleted: {
+      /** @enum {string} */
+      kind: 'lido_stake_completed';
+      network_fee: components['schemas']['NetworkFee'];
+      stake_in: components['schemas']['Stake'];
+      stake_out: components['schemas']['Stake'];
+    };
+    Data_LidoWithdrawalRequested: {
+      /** @enum {string} */
+      kind: 'lido_withdrawal_requested';
+      network_fee: components['schemas']['NetworkFee'];
+      stake_in: components['schemas']['Stake'];
+      stake_out: components['schemas']['Stake'];
+    };
+    Data_LidoStakeReadyToBeWithdrawn: {
+      /** @enum {string} */
+      kind: 'lido_stake_ready_to_be_withdrawn';
+      /** Format: decimal */
+      request_id: string;
+      staked_eth: components['schemas']['Stake'];
+    };
+    Data_LidoWithdrawalCompleted: {
+      /** @enum {string} */
+      kind: 'lido_withdrawal_completed';
+      network_fee: components['schemas']['NetworkFee'];
+      stake_in: components['schemas']['Stake'];
+      stake_out: components['schemas']['Stake'];
+    };
+    Data_RocketPoolStakeCompleted: {
+      /** @enum {string} */
+      kind: 'rocketpool_stake_completed';
+      network_fee: components['schemas']['NetworkFee'];
+      stake_in: components['schemas']['Stake'];
+      stake_out: components['schemas']['Stake'];
+    };
+    Data_RocketPoolUnstakeCompleted: {
+      /** @enum {string} */
+      kind: 'rocketpool_unstake_completed';
+      network_fee: components['schemas']['NetworkFee'];
+      stake_in: components['schemas']['Stake'];
+      stake_out: components['schemas']['Stake'];
+    };
+    Data_ETHSent: {
+      /** @enum {string} */
+      kind: 'eth_sent';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      amount: {
+        /** Format: decimal */
+        usd: string;
+        /** Format: decimal */
+        eth: string;
+      };
+    };
+    Data_ETHReceived: {
+      /** @enum {string} */
+      kind: 'eth_received';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      amount: {
+        /** Format: decimal */
+        usd: string;
+        /** Format: decimal */
+        eth: string;
+      };
+    };
+    Data_ERC20Sent: {
+      /** @enum {string} */
+      kind: 'erc20_sent';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      token: components['schemas']['Token'];
+    };
+    Data_ERC20Received: {
+      /** @enum {string} */
+      kind: 'erc20_received';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      token: components['schemas']['Token'];
+    };
+    Data_ERC721Sent: {
+      /** @enum {string} */
+      kind: 'erc721_sent';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      nft: components['schemas']['NFT'];
+    };
+    Data_ERC721Received: {
+      /** @enum {string} */
+      kind: 'erc721_received';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      nft: components['schemas']['NFT'];
+    };
+    Data_ERC1155Sent: {
+      /** @enum {string} */
+      kind: 'erc1155_sent';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      nft?: components['schemas']['NFT'];
+    };
+    Data_ERC1155Received: {
+      /** @enum {string} */
+      kind: 'erc1155_received';
+      network_fee: components['schemas']['NetworkFee'];
+      /** Format: address */
+      from: string;
+      /** Format: address */
+      to: string;
+      nft?: components['schemas']['NFT'];
+    };
+    NetworkFee: {
+      /** Format: decimal */
+      gas_price: string;
+      /** Format: decimal */
+      native_token_price_in_usd: string;
+    };
+    Token: {
+      /** Format: address */
+      address: string;
+      symbol: string;
+      name: string;
+      /** Format: decimal */
+      amount: string;
+      /** Format: int32 */
+      decimals: string;
+      /** Format: uri */
+      image: string;
+      /** Format: decimal */
+      usd: string;
+    };
+    NFT: {
+      name: string;
+      token_id: string;
+      /** Format: uri */
+      image: string;
+      collection: {
+        /** Format: address */
+        address: string;
+        name: string;
+        symbol: string;
+        /** Format: uri */
+        image: string;
+      };
+    };
+    Stake: {
+      /** Format: address */
+      address: string;
+      symbol: string;
+      name: string;
+      /** Format: decimal */
+      amount: string;
+      /** Format: int32 */
+      decimals: string;
+      /** Format: uri */
+      image: string;
+      /** Format: decimal */
+      usd: string;
+    };
+  };
+  responses: never;
+  parameters: never;
+  requestBodies: never;
+  headers: never;
+  pathItems: never;
+};
+
+export type $defs = Record<string, never>;
+
+export type external = Record<string, never>;
+
+export type operations = Record<string, never>;
diff --git a/app/scripts/controllers/metamask-notifications/types/type-utils.ts b/app/scripts/controllers/metamask-notifications/types/type-utils.ts
new file mode 100644
index 000000000000..f05a763f5d2c
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/type-utils.ts
@@ -0,0 +1,4 @@
+/**
+ * Computes and combines intersection types for a more "prettier" type (more human readable)
+ */
+export type Compute<T> = T extends T ? { [K in keyof T]: T[K] } : never;
diff --git a/app/scripts/controllers/metamask-notifications/types/types.ts b/app/scripts/controllers/metamask-notifications/types/types.ts
new file mode 100644
index 000000000000..c68c202e9e92
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/types.ts
@@ -0,0 +1,17 @@
+import type { FeatureAnnouncementRawNotification } from './feature-announcement/feature-announcement';
+import type { Compute } from './type-utils';
+import type { OnChainRawNotification } from './on-chain-notification/on-chain-notification';
+
+/**
+ * The shape of a "generic" notification.
+ * Other than the fields listed below, tt will also contain:
+ * - `type` field (declared in the Raw shapes)
+ * - `data` field (declared in the Raw shapes)
+ */
+export type Notification = Compute<
+  (FeatureAnnouncementRawNotification | OnChainRawNotification) & {
+    id: string;
+    createdAt: string;
+    isRead: boolean;
+  }
+>;
diff --git a/app/scripts/controllers/metamask-notifications/types/user-storage/user-storage.ts b/app/scripts/controllers/metamask-notifications/types/user-storage/user-storage.ts
new file mode 100644
index 000000000000..086d4cc7e4d4
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/user-storage/user-storage.ts
@@ -0,0 +1,32 @@
+import type {
+  SUPPORTED_CHAINS,
+  TRIGGER_TYPES,
+} from '../../constants/notification-schema';
+import type {
+  USER_STORAGE_VERSION_KEY,
+  USER_STORAGE_VERSION,
+} from '../../constants/constants';
+
+export type UserStorage = {
+  /**
+   * The Version 'v' of the User Storage.
+   * NOTE - will allow us to support upgrade/downgrades in the future
+   */
+  [USER_STORAGE_VERSION_KEY]: typeof USER_STORAGE_VERSION;
+  [address: string]: {
+    [chain in (typeof SUPPORTED_CHAINS)[number]]: {
+      [uuid: string]: {
+        /** Trigger Kind 'k' */
+        k: TRIGGER_TYPES;
+        /**
+         * Trigger Enabled 'e'
+         * This is mostly an 'acknowledgement' to determine if a trigger has been made
+         * For example if we fail to create a trigger, we can set to false & retry (on re-log in, or elsewhere)
+         *
+         * Most of the time this is 'true', as triggers when deleted are also removed from User Storage
+         */
+        e: boolean;
+      };
+    };
+  };
+};
diff --git a/app/scripts/controllers/metamask-notifications/utils/utils.test.ts b/app/scripts/controllers/metamask-notifications/utils/utils.test.ts
new file mode 100644
index 000000000000..b533f6c4559b
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/utils/utils.test.ts
@@ -0,0 +1,314 @@
+import { USER_STORAGE_VERSION_KEY } from '../constants/constants';
+import {
+  NOTIFICATION_CHAINS,
+  TRIGGER_TYPES,
+} from '../constants/notification-schema';
+import {
+  MOCK_USER_STORAGE_ACCOUNT,
+  MOCK_USER_STORAGE_CHAIN,
+  createMockFullUserStorage,
+  createMockUserStorageWithTriggers,
+} from '../mocks/mock-notification-user-storage';
+import { UserStorage } from '../types/user-storage/user-storage';
+import * as MetamaskNotificationsUtils from './utils';
+
+describe('metamask-notifications/utils - initializeUserStorage()', () => {
+  test('Creates a new user storage object based on the accounts provided', () => {
+    const mockAddress = 'MOCK_ADDRESS';
+    const userStorage = MetamaskNotificationsUtils.initializeUserStorage(
+      [{ address: mockAddress }],
+      true,
+    );
+
+    // Addresses in User Storage are lowercase to prevent multiple entries of same address
+    const userStorageAddress = mockAddress.toLowerCase();
+    expect(userStorage[userStorageAddress]).toBeDefined();
+  });
+
+  test('Returns User Storage with no addresses if none provided', () => {
+    function assertEmptyStorage(storage: UserStorage) {
+      expect(Object.keys(storage).length === 1).toBe(true);
+      expect(USER_STORAGE_VERSION_KEY in storage).toBe(true);
+    }
+
+    const userStorageTest1 = MetamaskNotificationsUtils.initializeUserStorage(
+      [],
+      true,
+    );
+    assertEmptyStorage(userStorageTest1);
+
+    const userStorageTest2 = MetamaskNotificationsUtils.initializeUserStorage(
+      [{ address: undefined }],
+      true,
+    );
+    assertEmptyStorage(userStorageTest2);
+  });
+});
+
+describe('metamask-notifications/utils - traverseUserStorageTriggers()', () => {
+  test('Traverses User Storage to return triggers', () => {
+    const storage = createMockFullUserStorage();
+    const triggersObjArray =
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(storage);
+    expect(triggersObjArray.length > 0).toBe(true);
+    expect(typeof triggersObjArray[0] === 'object').toBe(true);
+  });
+
+  test('Traverses and maps User Storage using mapper', () => {
+    const storage = createMockFullUserStorage();
+
+    // as the type suggests, the mapper returns a string, so expect this to be a string
+    const triggersStrArray =
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(storage, {
+        mapTrigger: (t) => t.id,
+      });
+    expect(triggersStrArray.length > 0).toBe(true);
+    expect(typeof triggersStrArray[0] === 'string').toBe(true);
+
+    // if the mapper returns a falsy value, it is filtered out
+    const emptyTriggersArray =
+      MetamaskNotificationsUtils.traverseUserStorageTriggers(storage, {
+        mapTrigger: (_t): string | undefined => undefined,
+      });
+    expect(emptyTriggersArray.length === 0).toBe(true);
+  });
+});
+
+describe('metamask-notifications/utils - checkAccountsPresence()', () => {
+  test('Returns record of addresses that are in storage', () => {
+    const storage = createMockFullUserStorage();
+    const result = MetamaskNotificationsUtils.checkAccountsPresence(storage, [
+      MOCK_USER_STORAGE_ACCOUNT,
+    ]);
+    expect(result).toEqual({
+      [MOCK_USER_STORAGE_ACCOUNT.toLowerCase()]: true,
+    });
+  });
+
+  test('Returns record of addresses in storage and not fully in storage', () => {
+    const storage = createMockFullUserStorage();
+    const MOCK_MISSING_ADDRESS = '0x2';
+    const result = MetamaskNotificationsUtils.checkAccountsPresence(storage, [
+      MOCK_USER_STORAGE_ACCOUNT,
+      MOCK_MISSING_ADDRESS,
+    ]);
+    expect(result).toEqual({
+      [MOCK_USER_STORAGE_ACCOUNT.toLowerCase()]: true,
+      [MOCK_MISSING_ADDRESS.toLowerCase()]: false,
+    });
+  });
+
+  test('Returns record where accounts are not fully present, due to missing chains', () => {
+    const storage = createMockFullUserStorage();
+    delete storage[MOCK_USER_STORAGE_ACCOUNT][NOTIFICATION_CHAINS.ETHEREUM];
+
+    const result = MetamaskNotificationsUtils.checkAccountsPresence(storage, [
+      MOCK_USER_STORAGE_ACCOUNT,
+    ]);
+    expect(result).toEqual({
+      [MOCK_USER_STORAGE_ACCOUNT.toLowerCase()]: false, // false due to missing chains
+    });
+  });
+
+  test('Returns record where accounts are not fully present, due to missing triggers', () => {
+    const storage = createMockFullUserStorage();
+    const MOCK_TRIGGER_TO_DELETE = Object.keys(
+      storage[MOCK_USER_STORAGE_ACCOUNT][NOTIFICATION_CHAINS.ETHEREUM],
+    )[0];
+    delete storage[MOCK_USER_STORAGE_ACCOUNT][NOTIFICATION_CHAINS.ETHEREUM][
+      MOCK_TRIGGER_TO_DELETE
+    ];
+
+    const result = MetamaskNotificationsUtils.checkAccountsPresence(storage, [
+      MOCK_USER_STORAGE_ACCOUNT,
+    ]);
+    expect(result).toEqual({
+      [MOCK_USER_STORAGE_ACCOUNT.toLowerCase()]: false, // false due to missing triggers
+    });
+  });
+});
+
+describe('metamask-notifications/utils - inferEnabledKinds()', () => {
+  test('Returns all kinds from a User Storage Obj', () => {
+    const partialStorage = createMockUserStorageWithTriggers([
+      { id: '1', e: true, k: TRIGGER_TYPES.ERC1155_RECEIVED },
+      { id: '2', e: true, k: TRIGGER_TYPES.ERC1155_SENT },
+      { id: '3', e: true, k: TRIGGER_TYPES.ERC1155_SENT }, // should remove duplicates
+    ]);
+
+    const result = MetamaskNotificationsUtils.inferEnabledKinds(partialStorage);
+    expect(result.length).toBe(2);
+    expect(result.includes(TRIGGER_TYPES.ERC1155_RECEIVED)).toBe(true);
+    expect(result.includes(TRIGGER_TYPES.ERC1155_SENT)).toBe(true);
+  });
+});
+
+describe('metamask-notifications/utils - getUUIDsForAccount()', () => {
+  test('Returns all trigger IDs in user storage from a given address', () => {
+    const partialStorage = createMockUserStorageWithTriggers(['t1', 't2']);
+
+    const result = MetamaskNotificationsUtils.getUUIDsForAccount(
+      partialStorage,
+      MOCK_USER_STORAGE_ACCOUNT,
+    );
+    expect(result.length).toBe(2);
+    expect(result.includes('t1')).toBe(true);
+    expect(result.includes('t2')).toBe(true);
+  });
+  test('Returns an empty array if the address does not exist or has any triggers', () => {
+    const partialStorage = createMockUserStorageWithTriggers(['t1', 't2']);
+    const result = MetamaskNotificationsUtils.getUUIDsForAccount(
+      partialStorage,
+      'ACCOUNT_THAT_DOES_NOT_EXIST_IN_STORAGE',
+    );
+    expect(result.length).toBe(0);
+  });
+});
+
+describe('metamask-notifications/utils - getAllUUIDs()', () => {
+  test('Returns all triggerIds in User Storage', () => {
+    const partialStorage = createMockUserStorageWithTriggers(['t1', 't2']);
+    const result1 = MetamaskNotificationsUtils.getAllUUIDs(partialStorage);
+    expect(result1.length).toBe(2);
+    expect(result1.includes('t1')).toBe(true);
+    expect(result1.includes('t2')).toBe(true);
+
+    const fullStorage = createMockFullUserStorage();
+    const result2 = MetamaskNotificationsUtils.getAllUUIDs(fullStorage);
+    expect(result2.length).toBeGreaterThan(2); // we expect there to be more than 2 triggers. We have multiple chains to there should be quite a few UUIDs.
+  });
+});
+
+describe('metamask-notifications/utils - getUUIDsForKinds()', () => {
+  test('Returns all triggerIds that match the kind', () => {
+    const partialStorage = createMockUserStorageWithTriggers([
+      { id: 't1', e: true, k: TRIGGER_TYPES.ERC1155_RECEIVED },
+      { id: 't2', e: true, k: TRIGGER_TYPES.ERC1155_SENT },
+    ]);
+    const result = MetamaskNotificationsUtils.getUUIDsForKinds(partialStorage, [
+      TRIGGER_TYPES.ERC1155_RECEIVED,
+    ]);
+    expect(result).toEqual(['t1']);
+  });
+
+  test('Returns empty list if no triggers are found matching the kinds', () => {
+    const partialStorage = createMockUserStorageWithTriggers([
+      { id: 't1', e: true, k: TRIGGER_TYPES.ERC1155_RECEIVED },
+      { id: 't2', e: true, k: TRIGGER_TYPES.ERC1155_SENT },
+    ]);
+    const result = MetamaskNotificationsUtils.getUUIDsForKinds(partialStorage, [
+      TRIGGER_TYPES.ETH_SENT, // A kind we have not created a trigger for
+    ]);
+    expect(result.length).toBe(0);
+  });
+});
+
+describe('metamask-notifications/utils - getUUIDsForAccountByKinds()', () => {
+  const createPartialStorage = () =>
+    createMockUserStorageWithTriggers([
+      { id: 't1', e: true, k: TRIGGER_TYPES.ERC1155_RECEIVED },
+      { id: 't2', e: true, k: TRIGGER_TYPES.ERC1155_SENT },
+    ]);
+
+  test('Returns triggers with correct account and matching kinds', () => {
+    const partialStorage = createPartialStorage();
+    const result = MetamaskNotificationsUtils.getUUIDsForAccountByKinds(
+      partialStorage,
+      MOCK_USER_STORAGE_ACCOUNT,
+      [TRIGGER_TYPES.ERC1155_RECEIVED],
+    );
+    expect(result.length).toBe(1);
+  });
+
+  test('Returns empty when using incorrect account', () => {
+    const partialStorage = createPartialStorage();
+    const result = MetamaskNotificationsUtils.getUUIDsForAccountByKinds(
+      partialStorage,
+      'ACCOUNT_THAT_DOES_NOT_EXIST_IN_STORAGE',
+      [TRIGGER_TYPES.ERC1155_RECEIVED],
+    );
+    expect(result.length).toBe(0);
+  });
+
+  test('Returns empty when using incorrect kind', () => {
+    const partialStorage = createPartialStorage();
+    const result = MetamaskNotificationsUtils.getUUIDsForAccountByKinds(
+      partialStorage,
+      MOCK_USER_STORAGE_ACCOUNT,
+      [TRIGGER_TYPES.ETH_SENT], // this trigger was not created in partial storage
+    );
+    expect(result.length).toBe(0);
+  });
+});
+
+describe('metamask-notifications/utils - upsertAddressTriggers()', () => {
+  test('Updates and adds new triggers for a new address', () => {
+    const MOCK_NEW_ADDRESS = 'MOCK_NEW_ADDRESS'.toLowerCase(); // addresses stored in user storage are lower-case
+    const storage = createMockFullUserStorage();
+
+    // Before
+    expect(storage[MOCK_NEW_ADDRESS]).toBeUndefined();
+
+    MetamaskNotificationsUtils.upsertAddressTriggers(MOCK_NEW_ADDRESS, storage);
+
+    // After
+    expect(storage[MOCK_NEW_ADDRESS]).toBeDefined();
+    const newTriggers = MetamaskNotificationsUtils.getUUIDsForAccount(
+      storage,
+      MOCK_NEW_ADDRESS,
+    );
+    expect(newTriggers.length > 0).toBe(true);
+  });
+});
+
+describe('metamask-notifications/utils - upsertTriggerTypeTriggers()', () => {
+  test('Updates and adds a new trigger to an address', () => {
+    const partialStorage = createMockUserStorageWithTriggers([
+      { id: 't1', e: true, k: TRIGGER_TYPES.ERC1155_RECEIVED },
+      { id: 't2', e: true, k: TRIGGER_TYPES.ERC1155_SENT },
+    ]);
+
+    // Before
+    expect(
+      MetamaskNotificationsUtils.getUUIDsForAccount(
+        partialStorage,
+        MOCK_USER_STORAGE_ACCOUNT,
+      ).length,
+    ).toBe(2);
+
+    MetamaskNotificationsUtils.upsertTriggerTypeTriggers(
+      TRIGGER_TYPES.ETH_SENT,
+      partialStorage,
+    );
+
+    // After
+    expect(
+      MetamaskNotificationsUtils.getUUIDsForAccount(
+        partialStorage,
+        MOCK_USER_STORAGE_ACCOUNT,
+      ).length,
+    ).toBe(3);
+  });
+});
+
+describe('metamask-notifications/utils - toggleUserStorageTriggerStatus()', () => {
+  test('Updates Triggers from disabled to enabled', () => {
+    // Triggers are initially set to false false.
+    const partialStorage = createMockUserStorageWithTriggers([
+      { id: 't1', k: TRIGGER_TYPES.ERC1155_RECEIVED, e: false },
+      { id: 't2', k: TRIGGER_TYPES.ERC1155_SENT, e: false },
+    ]);
+
+    MetamaskNotificationsUtils.toggleUserStorageTriggerStatus(
+      partialStorage,
+      MOCK_USER_STORAGE_ACCOUNT,
+      MOCK_USER_STORAGE_CHAIN,
+      't1',
+      true,
+    );
+
+    expect(
+      partialStorage[MOCK_USER_STORAGE_ACCOUNT][MOCK_USER_STORAGE_CHAIN].t1.e,
+    ).toBe(true);
+  });
+});
diff --git a/app/scripts/controllers/metamask-notifications/utils/utils.ts b/app/scripts/controllers/metamask-notifications/utils/utils.ts
new file mode 100644
index 000000000000..c0bfc89add6f
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/utils/utils.ts
@@ -0,0 +1,621 @@
+import log from 'loglevel';
+import { v4 as uuidv4 } from 'uuid';
+import type { UserStorage } from '../types/user-storage/user-storage';
+import {
+  USER_STORAGE_VERSION_KEY,
+  USER_STORAGE_VERSION,
+} from '../constants/constants';
+import {
+  TRIGGER_TYPES,
+  TRIGGER_TYPES_GROUPS,
+  TRIGGERS,
+} from '../constants/notification-schema';
+
+export type NotificationTrigger = {
+  id: string;
+  chainId: string;
+  kind: string;
+  address: string;
+  enabled: boolean;
+};
+
+type MapTriggerFn<Result> = (
+  trigger: NotificationTrigger,
+) => Result | undefined;
+
+type TraverseTriggerOpts<Result> = {
+  address?: string;
+  mapTrigger?: MapTriggerFn<Result>;
+};
+
+/**
+ * Extracts and returns the ID from a notification trigger.
+ * This utility function is primarily used as a mapping function in `traverseUserStorageTriggers`
+ * to convert a full trigger object into its ID string.
+ *
+ * @param trigger - The notification trigger from which the ID is extracted.
+ * @returns The ID of the provided notification trigger.
+ */
+const triggerToId = (trigger: NotificationTrigger): string => trigger.id;
+
+/**
+ * A utility function that returns the input trigger without any transformation.
+ * This function is used as the default mapping function in `traverseUserStorageTriggers`
+ * when no custom mapping function is provided.
+ *
+ * @param trigger - The notification trigger to be returned as is.
+ * @returns The same notification trigger that was passed in.
+ */
+const triggerIdentity = (trigger: NotificationTrigger): NotificationTrigger =>
+  trigger;
+
+/**
+ * Maps a given trigger type to its corresponding trigger group.
+ *
+ * This method categorizes each trigger type into one of the predefined groups:
+ * RECEIVED, SENT, or DEFI. These groups help in organizing triggers based on their nature.
+ * For instance, triggers related to receiving assets are categorized under RECEIVED,
+ * triggers for sending assets under SENT, and triggers related to decentralized finance (DeFi)
+ * operations under DEFI. This categorization aids in managing and responding to different types
+ * of notifications more effectively.
+ *
+ * @param type - The trigger type to be categorized.
+ * @returns The group to which the trigger type belongs.
+ */
+const groupTriggerTypes = (type: TRIGGER_TYPES): TRIGGER_TYPES_GROUPS => {
+  switch (type) {
+    case TRIGGER_TYPES.ERC20_RECEIVED:
+    case TRIGGER_TYPES.ETH_RECEIVED:
+    case TRIGGER_TYPES.ERC721_RECEIVED:
+    case TRIGGER_TYPES.ERC1155_RECEIVED:
+      return TRIGGER_TYPES_GROUPS.RECEIVED;
+    case TRIGGER_TYPES.ERC20_SENT:
+    case TRIGGER_TYPES.ETH_SENT:
+    case TRIGGER_TYPES.ERC721_SENT:
+    case TRIGGER_TYPES.ERC1155_SENT:
+      return TRIGGER_TYPES_GROUPS.SENT;
+    case TRIGGER_TYPES.METAMASK_SWAP_COMPLETED:
+    case TRIGGER_TYPES.ROCKETPOOL_STAKE_COMPLETED:
+    case TRIGGER_TYPES.ROCKETPOOL_UNSTAKE_COMPLETED:
+    case TRIGGER_TYPES.LIDO_STAKE_COMPLETED:
+    case TRIGGER_TYPES.LIDO_WITHDRAWAL_REQUESTED:
+    case TRIGGER_TYPES.LIDO_WITHDRAWAL_COMPLETED:
+    case TRIGGER_TYPES.LIDO_STAKE_READY_TO_BE_WITHDRAWN:
+      return TRIGGER_TYPES_GROUPS.DEFI;
+    default:
+      return TRIGGER_TYPES_GROUPS.DEFI;
+  }
+};
+
+/**
+ * Create a completely new user storage object with the given accounts and state.
+ * This method initializes the user storage with a version key and iterates over each account to populate it with triggers.
+ * Each trigger is associated with supported chains, and for each chain, a unique identifier (UUID) is generated.
+ * The trigger object contains a kind (`k`) indicating the type of trigger and an enabled state (`e`).
+ * The kind and enabled state are stored with abbreviated keys to reduce the JSON size.
+ *
+ * This is used primarily for creating a new user storage (e.g. when first signing in/enabling notification profile syncing),
+ * caution is needed in case you need to remove triggers that you don't want (due to notification setting filters)
+ *
+ * @param accounts - An array of account objects, each optionally containing an address.
+ * @param state - A boolean indicating the initial enabled state for all triggers in the user storage.
+ * @returns A `UserStorage` object populated with triggers for each account and chain.
+ */
+export function initializeUserStorage(
+  accounts: { address?: string }[],
+  state: boolean,
+): UserStorage {
+  const userStorage: UserStorage = {
+    [USER_STORAGE_VERSION_KEY]: USER_STORAGE_VERSION,
+  };
+
+  accounts.forEach((account) => {
+    const address = account.address?.toLowerCase();
+    if (!address) {
+      return;
+    }
+    if (!userStorage[address]) {
+      userStorage[address] = {};
+    }
+
+    Object.entries(TRIGGERS).forEach(
+      ([trigger, { supported_chains: supportedChains }]) => {
+        supportedChains.forEach((chain) => {
+          if (!userStorage[address]?.[chain]) {
+            userStorage[address][chain] = {};
+          }
+
+          userStorage[address][chain][uuidv4()] = {
+            k: trigger as TRIGGER_TYPES, // use 'k' instead of 'kind' to reduce the json weight
+            e: state, // use 'e' instead of 'enabled' to reduce the json weight
+          };
+        });
+      },
+    );
+  });
+
+  return userStorage;
+}
+
+/**
+ * Iterates over user storage to find and optionally transform notification triggers.
+ * This method allows for flexible retrieval and transformation of triggers based on provided options.
+ *
+ * @param userStorage - The user storage object containing notification triggers.
+ * @param options - Optional parameters to filter and map triggers:
+ * - `address`: If provided, only triggers for this address are considered.
+ * - `mapTrigger`: A function to transform each trigger. If not provided, triggers are returned as is.
+ * @returns An array of triggers, potentially transformed by the `mapTrigger` function.
+ */
+export function traverseUserStorageTriggers<
+  ResultTriggers = NotificationTrigger,
+>(
+  userStorage: UserStorage,
+  options?: TraverseTriggerOpts<ResultTriggers>,
+): ResultTriggers[] {
+  const triggers: ResultTriggers[] = [];
+  const mapTrigger =
+    options?.mapTrigger ?? (triggerIdentity as MapTriggerFn<ResultTriggers>);
+
+  for (const address in userStorage) {
+    if (address === (USER_STORAGE_VERSION_KEY as unknown as string)) {
+      continue;
+    }
+    if (options?.address && address !== options.address) {
+      continue;
+    }
+
+    for (const chainId in userStorage[address]) {
+      if (Object.hasOwn(userStorage[address], chainId)) {
+        for (const uuid in userStorage[address][chainId]) {
+          if (uuid) {
+            const mappedTrigger = mapTrigger({
+              id: uuid,
+              kind: userStorage[address]?.[chainId]?.[uuid]?.k,
+              chainId,
+              address,
+              enabled: userStorage[address]?.[chainId]?.[uuid]?.e ?? false,
+            });
+            if (mappedTrigger) {
+              triggers.push(mappedTrigger);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return triggers;
+}
+
+/**
+ * @deprecated - This needs rework for it to be feasible. Currently this is a half-baked solution, as it fails once we add new triggers (introspection for filters is difficult).
+ *
+ * Checks for the complete presence of trigger types by group across all addresses in the user storage.
+ * This method ensures that each address has at least one trigger of each type expected for every group.
+ * It leverages `traverseUserStorageTriggers` to iterate over triggers and check their presence.
+ * @param userStorage - The user storage object containing notification triggers.
+ * @returns A record indicating whether all expected trigger types for each group are present for every address.
+ */
+export function checkTriggersPresenceByGroup(
+  userStorage: UserStorage,
+): Record<TRIGGER_TYPES_GROUPS, boolean> {
+  // Initialize a record to track the complete presence of triggers for each group
+  const completeGroupPresence: Record<TRIGGER_TYPES_GROUPS, boolean> = {
+    [TRIGGER_TYPES_GROUPS.RECEIVED]: true,
+    [TRIGGER_TYPES_GROUPS.SENT]: true,
+    [TRIGGER_TYPES_GROUPS.DEFI]: true,
+  };
+
+  // Map to track the required trigger types for each group
+  const requiredTriggersByGroup: Record<
+    TRIGGER_TYPES_GROUPS,
+    Set<TRIGGER_TYPES>
+  > = {
+    [TRIGGER_TYPES_GROUPS.RECEIVED]: new Set([
+      TRIGGER_TYPES.ERC20_RECEIVED,
+      TRIGGER_TYPES.ETH_RECEIVED,
+      TRIGGER_TYPES.ERC721_RECEIVED,
+      TRIGGER_TYPES.ERC1155_RECEIVED,
+    ]),
+    [TRIGGER_TYPES_GROUPS.SENT]: new Set([
+      TRIGGER_TYPES.ERC20_SENT,
+      TRIGGER_TYPES.ETH_SENT,
+      TRIGGER_TYPES.ERC721_SENT,
+      TRIGGER_TYPES.ERC1155_SENT,
+    ]),
+    [TRIGGER_TYPES_GROUPS.DEFI]: new Set([
+      TRIGGER_TYPES.METAMASK_SWAP_COMPLETED,
+      TRIGGER_TYPES.ROCKETPOOL_STAKE_COMPLETED,
+      TRIGGER_TYPES.ROCKETPOOL_UNSTAKE_COMPLETED,
+      TRIGGER_TYPES.LIDO_STAKE_COMPLETED,
+      TRIGGER_TYPES.LIDO_WITHDRAWAL_REQUESTED,
+      TRIGGER_TYPES.LIDO_WITHDRAWAL_COMPLETED,
+      TRIGGER_TYPES.LIDO_STAKE_READY_TO_BE_WITHDRAWN,
+    ]),
+  };
+
+  // Object to keep track of encountered triggers for each group by address
+  const encounteredTriggers: Record<
+    string,
+    Record<TRIGGER_TYPES_GROUPS, Set<TRIGGER_TYPES>>
+  > = {};
+
+  // Use traverseUserStorageTriggers to iterate over all triggers
+  traverseUserStorageTriggers(userStorage, {
+    mapTrigger: (trigger) => {
+      const group = groupTriggerTypes(trigger.kind as TRIGGER_TYPES);
+      if (!encounteredTriggers[trigger.address]) {
+        encounteredTriggers[trigger.address] = {
+          [TRIGGER_TYPES_GROUPS.RECEIVED]: new Set(),
+          [TRIGGER_TYPES_GROUPS.SENT]: new Set(),
+          [TRIGGER_TYPES_GROUPS.DEFI]: new Set(),
+        };
+      }
+      encounteredTriggers[trigger.address][group].add(
+        trigger.kind as TRIGGER_TYPES,
+      );
+      return undefined; // We don't need to transform the trigger, just record its presence
+    },
+  });
+
+  // Check if all required triggers for each group are present for every address
+  Object.keys(encounteredTriggers).forEach((address) => {
+    Object.entries(requiredTriggersByGroup).forEach(
+      ([group, requiredTriggers]) => {
+        const hasAllTriggers = Array.from(requiredTriggers).every(
+          (triggerType) =>
+            encounteredTriggers[address][group as TRIGGER_TYPES_GROUPS].has(
+              triggerType,
+            ),
+        );
+        if (!hasAllTriggers) {
+          completeGroupPresence[group as TRIGGER_TYPES_GROUPS] = false;
+        }
+      },
+    );
+  });
+
+  return completeGroupPresence;
+}
+
+/**
+ * Verifies the presence of specified accounts and their chains in the user storage.
+ * This method checks if each provided account exists in the user storage and if all its supported chains are present.
+ *
+ * @param userStorage - The user storage object containing notification triggers.
+ * @param accounts - An array of account addresses to check for presence.
+ * @returns A record where each key is an account address and each value is a boolean indicating whether the account and all its supported chains are present in the user storage.
+ */
+export function checkAccountsPresence(
+  userStorage: UserStorage,
+  accounts: string[],
+): Record<string, boolean> {
+  const presenceRecord: Record<string, boolean> = {};
+
+  // Initialize presence record for all accounts as false
+  accounts.forEach((account) => {
+    presenceRecord[account.toLowerCase()] = isAccountEnabled(
+      account,
+      userStorage,
+    );
+  });
+
+  return presenceRecord;
+}
+
+function isAccountEnabled(
+  accountAddress: string,
+  userStorage: UserStorage,
+): boolean {
+  const accountObject = userStorage[accountAddress?.toLowerCase()];
+
+  // If the account address is not present in the userStorage, return true
+  if (!accountObject) {
+    return false;
+  }
+
+  // Check if all available chains are present
+  for (const [triggerKind, triggerConfig] of Object.entries(TRIGGERS)) {
+    for (const chain of triggerConfig.supported_chains) {
+      if (!accountObject[chain]) {
+        return false;
+      }
+
+      const triggerExists = Object.values(accountObject[chain]).some(
+        (obj) => obj.k === triggerKind,
+      );
+      if (!triggerExists) {
+        return false;
+      }
+
+      // Check if any trigger is disabled
+      for (const uuid in accountObject[chain]) {
+        if (!accountObject[chain][uuid].e) {
+          return false;
+        }
+      }
+    }
+  }
+
+  return true;
+}
+
+/**
+ * Infers and returns an array of enabled notification trigger kinds from the user storage.
+ * This method counts the occurrences of each kind of trigger and returns the kinds that are present.
+ *
+ * @param userStorage - The user storage object containing notification triggers.
+ * @returns An array of trigger kinds (`TRIGGER_TYPES`) that are enabled in the user storage.
+ */
+export function inferEnabledKinds(userStorage: UserStorage): TRIGGER_TYPES[] {
+  const allSupportedKinds = new Set<TRIGGER_TYPES>();
+
+  traverseUserStorageTriggers(userStorage, {
+    mapTrigger: (t) => {
+      allSupportedKinds.add(t.kind as TRIGGER_TYPES);
+    },
+  });
+
+  return Array.from(allSupportedKinds);
+}
+
+/**
+ * Retrieves all UUIDs associated with a specific account address from the user storage.
+ * This function utilizes `traverseUserStorageTriggers` with a mapping function to extract
+ * just the UUIDs of the notification triggers for the given address.
+ *
+ * @param userStorage - The user storage object containing notification triggers.
+ * @param address - The specific account address to retrieve UUIDs for.
+ * @returns An array of UUID strings associated with the given account address.
+ */
+export function getUUIDsForAccount(
+  userStorage: UserStorage,
+  address: string,
+): string[] {
+  return traverseUserStorageTriggers(userStorage, {
+    address,
+    mapTrigger: triggerToId,
+  });
+}
+
+/**
+ * Retrieves all UUIDs from the user storage, regardless of the account address or chain ID.
+ * This method leverages `traverseUserStorageTriggers` with a specific mapping function (`triggerToId`)
+ * to extract only the UUIDs from all notification triggers present in the user storage.
+ *
+ * @param userStorage - The user storage object containing notification triggers.
+ * @returns An array of UUID strings from all notification triggers in the user storage.
+ */
+export function getAllUUIDs(userStorage: UserStorage): string[] {
+  return traverseUserStorageTriggers(userStorage, {
+    mapTrigger: triggerToId,
+  });
+}
+
+/**
+ * Retrieves UUIDs for notification triggers that match any of the specified kinds.
+ * This method filters triggers based on their kind and returns an array of UUIDs for those that match the allowed kinds.
+ * It utilizes `traverseUserStorageTriggers` with a custom mapping function that checks if a trigger's kind is in the allowed list.
+ *
+ * @param userStorage - The user storage object containing notification triggers.
+ * @param allowedKinds - An array of kinds (as strings) to filter the triggers by.
+ * @returns An array of UUID strings for triggers that match the allowed kinds.
+ */
+export function getUUIDsForKinds(
+  userStorage: UserStorage,
+  allowedKinds: string[],
+): string[] {
+  const kindsSet = new Set(allowedKinds);
+
+  return traverseUserStorageTriggers(userStorage, {
+    mapTrigger: (t) => (kindsSet.has(t.kind) ? t.id : undefined),
+  });
+}
+
+/**
+ * Retrieves notification triggers for a specific account address that match any of the specified kinds.
+ * This method filters triggers both by the account address and their kind, returning triggers that match the allowed kinds for the specified address.
+ * It leverages `traverseUserStorageTriggers` with a custom mapping function to filter and return only the relevant triggers.
+ *
+ * @param userStorage - The user storage object containing notification triggers.
+ * @param address - The specific account address for which to retrieve triggers.
+ * @param allowedKinds - An array of trigger kinds (`TRIGGER_TYPES`) to filter the triggers by.
+ * @returns An array of `NotificationTrigger` objects that match the allowed kinds for the specified account address.
+ */
+export function getUUIDsForAccountByKinds(
+  userStorage: UserStorage,
+  address: string,
+  allowedKinds: TRIGGER_TYPES[],
+): NotificationTrigger[] {
+  const allowedKindsSet = new Set(allowedKinds);
+  return traverseUserStorageTriggers<NotificationTrigger>(userStorage, {
+    address,
+    mapTrigger: (trigger) => {
+      if (allowedKindsSet.has(trigger.kind as TRIGGER_TYPES)) {
+        return trigger;
+      }
+      return undefined;
+    },
+  });
+}
+
+/**
+ * Upserts (updates or inserts) notification triggers for a given account across all supported chains.
+ * This method ensures that each supported trigger type exists for each chain associated with the account.
+ * If a trigger type does not exist for a chain, it creates a new trigger with a unique UUID.
+ *
+ * @param _account - The account address for which to upsert triggers. The address is normalized to lowercase.
+ * @param userStorage - The user storage object to be updated with new or existing triggers.
+ * @returns The updated user storage object with upserted triggers for the specified account.
+ */
+export function upsertAddressTriggers(
+  _account: string,
+  userStorage: UserStorage,
+): UserStorage {
+  // Ensure the account exists in userStorage
+  const account = _account.toLowerCase();
+  userStorage[account] = userStorage[account] || {};
+
+  // Iterate over each trigger and its supported chains
+  for (const [trigger, { supported_chains: supportedChains }] of Object.entries(
+    TRIGGERS,
+  )) {
+    for (const chain of supportedChains) {
+      // Ensure the chain exists for the account
+      userStorage[account][chain] = userStorage[account][chain] || {};
+
+      // Check if the trigger exists for the chain
+      const existingTrigger = Object.values(userStorage[account][chain]).find(
+        (obj) => obj.k === trigger,
+      );
+
+      if (!existingTrigger) {
+        // If the trigger doesn't exist, create a new one with a new UUID
+        const uuid = uuidv4();
+        userStorage[account][chain][uuid] = {
+          k: trigger as TRIGGER_TYPES,
+          e: false,
+        };
+      }
+    }
+  }
+
+  return userStorage;
+}
+
+/**
+ * Upserts (updates or inserts) notification triggers of a specific type across all accounts and chains in user storage.
+ * This method ensures that a trigger of the specified type exists for each account and chain. If a trigger of the specified type
+ * does not exist for an account and chain, it creates a new trigger with a unique UUID.
+ *
+ * @param triggerType - The type of trigger to upsert across all accounts and chains.
+ * @param userStorage - The user storage object to be updated with new or existing triggers of the specified type.
+ * @returns The updated user storage object with upserted triggers of the specified type for all accounts and chains.
+ */
+export function upsertTriggerTypeTriggers(
+  triggerType: TRIGGER_TYPES,
+  userStorage: UserStorage,
+): UserStorage {
+  // Iterate over each account in userStorage
+  Object.entries(userStorage).forEach(([account, chains]) => {
+    if (account === (USER_STORAGE_VERSION_KEY as unknown as string)) {
+      return;
+    }
+
+    // Iterate over each chain for the account
+    Object.entries(chains).forEach(([chain, triggers]) => {
+      // Check if the trigger type exists for the chain
+      const existingTrigger = Object.values(triggers).find(
+        (obj) => obj.k === triggerType,
+      );
+
+      if (!existingTrigger) {
+        // If the trigger type doesn't exist, create a new one with a new UUID
+        const uuid = uuidv4();
+        userStorage[account][chain][uuid] = {
+          k: triggerType,
+          e: false,
+        };
+      }
+    });
+  });
+
+  return userStorage;
+}
+
+/**
+ * Toggles the enabled status of a user storage trigger.
+ *
+ * @param userStorage - The user storage object.
+ * @param address - The user's address.
+ * @param chainId - The chain ID.
+ * @param uuid - The unique identifier for the trigger.
+ * @param enabled - The new enabled status.
+ * @returns The updated user storage object.
+ */
+export function toggleUserStorageTriggerStatus(
+  userStorage: UserStorage,
+  address: string,
+  chainId: string,
+  uuid: string,
+  enabled: boolean,
+): UserStorage {
+  if (userStorage?.[address]?.[chainId]?.[uuid]) {
+    userStorage[address][chainId][uuid].e = enabled;
+  }
+
+  return userStorage;
+}
+
+/**
+ * Attempts to fetch a resource from the network, retrying the request up to a specified number of times
+ * in case of failure, with a delay between attempts.
+ *
+ * @param url - The resource URL.
+ * @param options - The options for the fetch request.
+ * @param retries - Maximum number of retry attempts. Defaults to 3.
+ * @param retryDelay - Delay between retry attempts in milliseconds. Defaults to 1000.
+ * @returns A Promise resolving to the Response object.
+ * @throws Will throw an error if the request fails after the specified number of retries.
+ */
+async function fetchWithRetry(
+  url: string,
+  options: RequestInit,
+  retries = 3,
+  retryDelay = 1000,
+): Promise<Response> {
+  for (let attempt = 1; attempt <= retries; attempt++) {
+    try {
+      const response = await fetch(url, options);
+      if (!response.ok) {
+        throw new Error(`Fetch failed with status: ${response.status}`);
+      }
+      return response;
+    } catch (error) {
+      log.error(`Attempt ${attempt} failed for fetch:`, error);
+      if (attempt < retries) {
+        await new Promise((resolve) => setTimeout(resolve, retryDelay));
+      } else {
+        throw new Error(
+          `Fetching failed after ${retries} retries. Last error: ${
+            error instanceof Error ? error.message : 'Unknown error'
+          }`,
+        );
+      }
+    }
+  }
+
+  throw new Error('Unexpected error in fetchWithRetry');
+}
+
+/**
+ * Performs an API call with automatic retries on failure.
+ *
+ * @param bearerToken - The JSON Web Token for authorization.
+ * @param endpoint - The URL of the API endpoint to call.
+ * @param method - The HTTP method ('POST' or 'DELETE').
+ * @param body - The body of the request. It should be an object that can be serialized to JSON.
+ * @param retries - The number of retry attempts in case of failure (default is 3).
+ * @param retryDelay - The delay between retries in milliseconds (default is 1000).
+ * @returns A Promise that resolves to the response of the fetch request.
+ */
+export async function makeApiCall<T>(
+  bearerToken: string,
+  endpoint: string,
+  method: 'POST' | 'DELETE',
+  body: T,
+  retries = 3,
+  retryDelay = 1000,
+): Promise<Response> {
+  const options: RequestInit = {
+    method,
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${bearerToken}`,
+    },
+    body: JSON.stringify(body),
+  };
+
+  return fetchWithRetry(endpoint, options, retries, retryDelay);
+}
diff --git a/app/scripts/controllers/mmi-controller.test.ts b/app/scripts/controllers/mmi-controller.test.ts
index df8de77c2212..b926be047da5 100644
--- a/app/scripts/controllers/mmi-controller.test.ts
+++ b/app/scripts/controllers/mmi-controller.test.ts
@@ -201,10 +201,10 @@ describe('MMIController', function () {
       initState: {
         custodyAccountDetails: {
           [mockAccount.address]: {
-            custodyType: 'Custody - Jupiter',
+            custodyType: 'Custody - ECA3',
           },
           [mockAccount2.address]: {
-            custodyType: 'Custody - Jupiter',
+            custodyType: 'Custody - ECA3',
           },
         },
       },
@@ -438,11 +438,11 @@ describe('MMIController', function () {
           getCustodianAccounts: mockCustodialKeyring,
         });
 
-      await mmiController.getCustodianAccounts('token', 'mock url', 'JUPITER');
+      await mmiController.getCustodianAccounts('token', 'neptune-custody', 'ECA3');
 
       expect(selectedAccountSpy).toHaveBeenCalledTimes(0);
 
-      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - Jupiter');
+      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - ECA3');
       expect(mockCustodialKeyring).toHaveBeenCalled();
     });
 
@@ -454,14 +454,14 @@ describe('MMIController', function () {
           getCustodianAccounts: mockCustodialKeyring,
         });
 
-      await mmiController.getCustodianAccounts('token', 'mock url');
+      await mmiController.getCustodianAccounts('token', 'neptune-custody');
 
       expect(selectedAccountSpy).toHaveBeenCalledWith(
         'AccountsController:getSelectedAccount',
       );
       expect(selectedAccountSpy).toHaveReturnedWith(mockAccount);
 
-      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - Jupiter');
+      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - ECA3');
       expect(mockCustodialKeyring).toHaveBeenCalled();
     });
   });
diff --git a/app/scripts/controllers/mmi-controller.ts b/app/scripts/controllers/mmi-controller.ts
index b2d66f36afdf..31de78659952 100644
--- a/app/scripts/controllers/mmi-controller.ts
+++ b/app/scripts/controllers/mmi-controller.ts
@@ -35,6 +35,7 @@ import {
   IInteractiveRefreshTokenChangeEvent,
   Label,
   Signature,
+  ConnectionRequest,
 } from '../../../shared/constants/mmi-controller';
 import AccountTracker from '../lib/account-tracker';
 import AppStateController from './app-state';
@@ -48,6 +49,8 @@ type UpdateCustodianTransactionsParameters = {
   txList: string[];
   custodyController: CustodyController;
   transactionUpdateController: TransactionUpdateController;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   txStateManager: any;
   getPendingNonce: (address: string) => Promise<number>;
   setTxHash: (txId: string, txHash: string) => void;
@@ -58,6 +61,8 @@ export default class MMIController extends EventEmitter {
 
   public mmiConfigurationController: MmiConfigurationController;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public keyringController: any;
 
   public preferencesController: PreferencesController;
@@ -68,8 +73,12 @@ export default class MMIController extends EventEmitter {
 
   private custodyController: CustodyController;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private getState: () => any;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private getPendingNonce: (address: string) => Promise<any>;
 
   private accountTracker: AccountTracker;
@@ -78,28 +87,46 @@ export default class MMIController extends EventEmitter {
 
   private networkController: NetworkController;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private permissionController: any;
 
   private signatureController: SignatureController;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private messenger: any;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private platform: any;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private extension: any;
 
   private updateTransactionHash: (txId: string, txHash: string) => void;
 
+  private setChannelId: (channelId: string) => void;
+
+  private setConnectionRequest: (payload: ConnectionRequest | null) => void;
+
   public trackTransactionEvents: (
     args: { transactionMeta: TransactionMeta },
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     event: any,
   ) => void;
 
   private txStateManager: {
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     getTransactions: (query?: any, opts?: any, fullTx?: boolean) => any[];
     setTxStatusSigned: (txId: string) => void;
     setTxStatusSubmitted: (txId: string) => void;
     setTxStatusFailed: (txId: string) => void;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     updateTransaction: (txMeta: any) => void;
   };
 
@@ -125,6 +152,8 @@ export default class MMIController extends EventEmitter {
     this.extension = opts.extension;
 
     this.updateTransactionHash = opts.updateTransactionHash;
+    this.setChannelId = opts.setChannelId;
+    this.setConnectionRequest = opts.setConnectionRequest;
 
     this.trackTransactionEvents = opts.trackTransactionEvents;
     this.txStateManager = {
@@ -163,6 +192,20 @@ export default class MMIController extends EventEmitter {
         await this.handleSigningEvents(signature, messageId, 'v4');
       },
     );
+
+    this.transactionUpdateController.on(
+      'handshake',
+      async ({ channelId }: { channelId: string }) => {
+        this.setChannelId(channelId);
+      },
+    );
+
+    this.transactionUpdateController.on(
+      'connection.request',
+      async (payload: ConnectionRequest) => {
+        this.setConnectionRequest(payload);
+      },
+    );
   } // End of constructor
 
   async persistKeyringsAfterRefreshTokenChange() {
@@ -171,6 +214,8 @@ export default class MMIController extends EventEmitter {
 
   async trackTransactionEventFromCustodianEvent(
     txMeta: TransactionMeta,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     event: any,
   ) {
     // transactionMetricsRequest parameter is already bound in the constructor
@@ -322,6 +367,8 @@ export default class MMIController extends EventEmitter {
       string,
       {
         name: string;
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         custodianDetails: any;
         labels: Label[];
         token: string;
diff --git a/app/scripts/controllers/onboarding.test.ts b/app/scripts/controllers/onboarding.test.ts
new file mode 100644
index 000000000000..61b9cf8de589
--- /dev/null
+++ b/app/scripts/controllers/onboarding.test.ts
@@ -0,0 +1,57 @@
+import { FirstTimeFlowType } from '../../../shared/constants/onboarding';
+import OnboardingController, { OnboardingControllerState } from './onboarding';
+
+describe('OnboardingController', () => {
+  let onboardingController: OnboardingController;
+
+  beforeEach(() => {
+    onboardingController = new OnboardingController({
+      initState: {
+        seedPhraseBackedUp: null,
+        firstTimeFlowType: null,
+        completedOnboarding: false,
+        onboardingTabs: {},
+      },
+    });
+  });
+
+  it('should set the seedPhraseBackedUp property', () => {
+    const newSeedPhraseBackUpState = true;
+    onboardingController.setSeedPhraseBackedUp(newSeedPhraseBackUpState);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    expect(state.seedPhraseBackedUp).toBe(newSeedPhraseBackUpState);
+  });
+
+  it('should set the firstTimeFlowType property', () => {
+    const type: FirstTimeFlowType = FirstTimeFlowType.create;
+    onboardingController.setFirstTimeFlowType(type);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    expect(state.firstTimeFlowType).toBe(type);
+  });
+
+  it('should register a site for onboarding', async () => {
+    const location = 'example.com';
+    const tabId = '123';
+    await onboardingController.registerOnboarding(location, tabId);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    expect(state.onboardingTabs?.[location]).toBe(tabId);
+  });
+
+  it('should skip update state if the location is already onboard', async () => {
+    const location = 'example.com';
+    const tabId = '123';
+    await onboardingController.registerOnboarding(location, tabId);
+    const state: OnboardingControllerState =
+      onboardingController.store.getState();
+    const updateStateSpy = jest.spyOn(
+      onboardingController.store,
+      'updateState',
+    );
+
+    expect(state.onboardingTabs?.[location]).toBe(tabId);
+    expect(updateStateSpy).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/scripts/controllers/permissions/background-api.js b/app/scripts/controllers/permissions/background-api.js
index fe5ee6c755b1..5a543492379f 100644
--- a/app/scripts/controllers/permissions/background-api.js
+++ b/app/scripts/controllers/permissions/background-api.js
@@ -7,13 +7,13 @@ import {
 export function getPermissionBackgroundApiMethods(permissionController) {
   return {
     addPermittedAccount: (origin, account) => {
-      const existing = permissionController.getCaveat(
+      const { value: existingAccounts } = permissionController.getCaveat(
         origin,
         RestrictedMethods.eth_accounts,
         CaveatTypes.restrictReturnedAccounts,
       );
 
-      if (existing.value.includes(account)) {
+      if (existingAccounts.includes(account)) {
         return;
       }
 
@@ -21,41 +21,49 @@ export function getPermissionBackgroundApiMethods(permissionController) {
         origin,
         RestrictedMethods.eth_accounts,
         CaveatTypes.restrictReturnedAccounts,
-        [...existing.value, account],
+        [...existingAccounts, account],
       );
     },
 
-    // To add more than one accounts when already connected to the dapp
+    // To add more than one account when already connected to the dapp
     addMorePermittedAccounts: (origin, accounts) => {
-      const existing = permissionController.getCaveat(
+      const { value: existingAccounts } = permissionController.getCaveat(
         origin,
         RestrictedMethods.eth_accounts,
         CaveatTypes.restrictReturnedAccounts,
       );
-      // Since this function will be called for unconnected accounts, we dodn't need an extra check
+
+      const updatedAccounts = Array.from(
+        new Set([...existingAccounts, ...accounts]),
+      );
+
+      if (updatedAccounts.length === existingAccounts.length) {
+        return;
+      }
+
       permissionController.updateCaveat(
         origin,
         RestrictedMethods.eth_accounts,
         CaveatTypes.restrictReturnedAccounts,
-        [...existing.value, ...accounts],
+        updatedAccounts,
       );
     },
 
     removePermittedAccount: (origin, account) => {
-      const existing = permissionController.getCaveat(
+      const { value: existingAccounts } = permissionController.getCaveat(
         origin,
         RestrictedMethods.eth_accounts,
         CaveatTypes.restrictReturnedAccounts,
       );
 
-      if (!existing.value.includes(account)) {
-        return;
-      }
-
-      const remainingAccounts = existing.value.filter(
+      const remainingAccounts = existingAccounts.filter(
         (existingAccount) => existingAccount !== account,
       );
 
+      if (remainingAccounts.length === existingAccounts.length) {
+        return;
+      }
+
       if (remainingAccounts.length === 0) {
         permissionController.revokePermission(
           origin,
diff --git a/app/scripts/controllers/permissions/background-api.test.js b/app/scripts/controllers/permissions/background-api.test.js
index a7f433eb1d25..b1b10b12bfb4 100644
--- a/app/scripts/controllers/permissions/background-api.test.js
+++ b/app/scripts/controllers/permissions/background-api.test.js
@@ -34,7 +34,7 @@ describe('permission background API methods', () => {
       );
     });
 
-    it('does not add a permitted account', () => {
+    it('does not add an already permitted account', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementationOnce(() => {
           return { type: CaveatTypes.restrictReturnedAccounts, value: ['0x1'] };
@@ -56,6 +56,140 @@ describe('permission background API methods', () => {
     });
   });
 
+  describe('addMorePermittedAccounts', () => {
+    it('adds a permitted account', () => {
+      const permissionController = {
+        getCaveat: jest.fn().mockImplementationOnce(() => {
+          return { type: CaveatTypes.restrictReturnedAccounts, value: ['0x1'] };
+        }),
+        updateCaveat: jest.fn(),
+      };
+
+      getPermissionBackgroundApiMethods(
+        permissionController,
+      ).addMorePermittedAccounts('foo.com', ['0x2']);
+
+      expect(permissionController.getCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.getCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+      );
+
+      expect(permissionController.updateCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.updateCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+        ['0x1', '0x2'],
+      );
+    });
+
+    it('adds multiple permitted accounts', () => {
+      const permissionController = {
+        getCaveat: jest.fn().mockImplementationOnce(() => {
+          return { type: CaveatTypes.restrictReturnedAccounts, value: ['0x1'] };
+        }),
+        updateCaveat: jest.fn(),
+      };
+
+      getPermissionBackgroundApiMethods(
+        permissionController,
+      ).addMorePermittedAccounts('foo.com', ['0x2', '0x3']);
+
+      expect(permissionController.getCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.getCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+      );
+
+      expect(permissionController.updateCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.updateCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+        ['0x1', '0x2', '0x3'],
+      );
+    });
+
+    it('adds multiple permitted accounts (partial overlap)', () => {
+      const permissionController = {
+        getCaveat: jest.fn().mockImplementationOnce(() => {
+          return {
+            type: CaveatTypes.restrictReturnedAccounts,
+            value: ['0x1', '0x2', '0x3'],
+          };
+        }),
+        updateCaveat: jest.fn(),
+      };
+
+      getPermissionBackgroundApiMethods(
+        permissionController,
+      ).addMorePermittedAccounts('foo.com', ['0x2', '0x4']);
+
+      expect(permissionController.getCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.getCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+      );
+
+      expect(permissionController.updateCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.updateCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+        ['0x1', '0x2', '0x3', '0x4'],
+      );
+    });
+
+    it('does not add an already permitted account', () => {
+      const permissionController = {
+        getCaveat: jest.fn().mockImplementationOnce(() => {
+          return { type: CaveatTypes.restrictReturnedAccounts, value: ['0x1'] };
+        }),
+        updateCaveat: jest.fn(),
+      };
+
+      getPermissionBackgroundApiMethods(
+        permissionController,
+      ).addMorePermittedAccounts('foo.com', ['0x1']);
+      expect(permissionController.getCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.getCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+      );
+
+      expect(permissionController.updateCaveat).not.toHaveBeenCalled();
+    });
+
+    it('does not add multiple already permitted accounts', () => {
+      const permissionController = {
+        getCaveat: jest.fn().mockImplementationOnce(() => {
+          return {
+            type: CaveatTypes.restrictReturnedAccounts,
+            value: ['0x1', '0x2', '0x3'],
+          };
+        }),
+        updateCaveat: jest.fn(),
+      };
+
+      getPermissionBackgroundApiMethods(
+        permissionController,
+      ).addMorePermittedAccounts('foo.com', ['0x1', '0x3']);
+      expect(permissionController.getCaveat).toHaveBeenCalledTimes(1);
+      expect(permissionController.getCaveat).toHaveBeenCalledWith(
+        'foo.com',
+        RestrictedMethods.eth_accounts,
+        CaveatTypes.restrictReturnedAccounts,
+      );
+
+      expect(permissionController.updateCaveat).not.toHaveBeenCalled();
+    });
+  });
+
   describe('removePermittedAccount', () => {
     it('removes a permitted account', () => {
       const permissionController = {
diff --git a/app/scripts/controllers/permissions/enums.js b/app/scripts/controllers/permissions/enums.js
deleted file mode 100644
index 4ede66f22cb9..000000000000
--- a/app/scripts/controllers/permissions/enums.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const NOTIFICATION_NAMES = {
-  accountsChanged: 'metamask_accountsChanged',
-  unlockStateChanged: 'metamask_unlockStateChanged',
-  chainChanged: 'metamask_chainChanged',
-};
diff --git a/app/scripts/controllers/permissions/enums.ts b/app/scripts/controllers/permissions/enums.ts
new file mode 100644
index 000000000000..c170bd78aa67
--- /dev/null
+++ b/app/scripts/controllers/permissions/enums.ts
@@ -0,0 +1,5 @@
+export enum NOTIFICATION_NAMES {
+  accountsChanged = 'metamask_accountsChanged',
+  unlockStateChanged = 'metamask_unlockStateChanged',
+  chainChanged = 'metamask_chainChanged',
+}
diff --git a/app/scripts/controllers/permissions/specifications.js b/app/scripts/controllers/permissions/specifications.js
index 8d5b8ec8a789..e86971e42863 100644
--- a/app/scripts/controllers/permissions/specifications.js
+++ b/app/scripts/controllers/permissions/specifications.js
@@ -97,12 +97,6 @@ export const getPermissionSpecifications = ({
       allowedCaveats: [CaveatTypes.restrictReturnedAccounts],
 
       factory: (permissionOptions, requestData) => {
-        if (Array.isArray(permissionOptions.caveats)) {
-          throw new Error(
-            `${PermissionNames.eth_accounts} error: Received unexpected caveats. Any permitted caveats will be added automatically.`,
-          );
-        }
-
         // This value will be further validated as part of the caveat.
         if (!requestData.approvedAccounts) {
           throw new Error(
diff --git a/app/scripts/controllers/permissions/specifications.test.js b/app/scripts/controllers/permissions/specifications.test.js
index a90ac4e87e63..3f140b39d052 100644
--- a/app/scripts/controllers/permissions/specifications.test.js
+++ b/app/scripts/controllers/permissions/specifications.test.js
@@ -232,7 +232,7 @@ describe('PermissionController specifications', () => {
           ).toThrow(/No approved accounts specified\.$/u);
         });
 
-        it('throws an error if any caveats are specified directly', () => {
+        it('uses the approved accounts even if caveats are specified', () => {
           const getInternalAccounts = jest.fn();
           const getAllAccounts = jest.fn();
           const { factory } = getPermissionSpecifications({
@@ -240,7 +240,7 @@ describe('PermissionController specifications', () => {
             getAllAccounts,
           })[RestrictedMethods.eth_accounts];
 
-          expect(() =>
+          expect(
             factory(
               {
                 caveats: [
@@ -252,9 +252,20 @@ describe('PermissionController specifications', () => {
                 invoker: 'foo.bar',
                 target: 'eth_accounts',
               },
-              { approvedAccounts: ['0x1'] },
+              { approvedAccounts: ['0x1', '0x3'] },
             ),
-          ).toThrow(/Received unexpected caveats./u);
+          ).toStrictEqual({
+            caveats: [
+              {
+                type: CaveatTypes.restrictReturnedAccounts,
+                value: ['0x1', '0x3'],
+              },
+            ],
+            date: 1,
+            id: expect.any(String),
+            invoker: 'foo.bar',
+            parentCapability: 'eth_accounts',
+          });
         });
       });
 
diff --git a/app/scripts/controllers/preferences.d.ts b/app/scripts/controllers/preferences.d.ts
index 563c7e822f4a..cc6a99af3671 100644
--- a/app/scripts/controllers/preferences.d.ts
+++ b/app/scripts/controllers/preferences.d.ts
@@ -12,7 +12,6 @@ export type PreferencesController = {
   setSelectedAddress(addressToLowerCase: string): void;
   getSelectedAddress(): string;
   setAccountLabel(address: string, label: string): void;
-  setAddresses(allAccounts: string[]): void;
   store: {
     getState: () => PreferencesControllerState;
     subscribe: (callback: (state: PreferencesControllerState) => void) => void;
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 7a50baaffb0d..86dc13cba38f 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -15,7 +15,6 @@ const mainNetworks = {
 const testNetworks = {
   [CHAIN_IDS.GOERLI]: true,
   [CHAIN_IDS.SEPOLIA]: true,
-  [CHAIN_IDS.LINEA_GOERLI]: true,
   [CHAIN_IDS.LINEA_SEPOLIA]: true,
 };
 
@@ -57,11 +56,11 @@ export default class PreferencesController {
       useSafeChainsListValidation: true,
       // set to true means the dynamic list from the API is being used
       // set to false will be using the static list from contract-metadata
-      useTokenDetection: false,
+      useTokenDetection: opts?.initState?.useTokenDetection ?? true,
       useNftDetection: false,
       use4ByteResolution: true,
       useCurrencyRateCheck: true,
-      useRequestQueue: false,
+      useRequestQueue: true,
       openSeaEnabled: false,
       ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
       securityAlertsEnabled: true,
@@ -91,9 +90,12 @@ export default class PreferencesController {
         showExtensionInFullSizeView: false,
         showFiatInTestnets: false,
         showTestNetworks: false,
+        smartTransactionsOptInStatus: null, // null means we will show the Smart Transactions opt-in modal to a user if they are eligible
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
+        redesignedConfirmationsEnabled: true,
+        featureNotificationsEnabled: false,
       },
       // ENS decentralized website resolution
       ipfsGateway: IPFS_DEFAULT_GATEWAY_URL,
@@ -111,6 +113,11 @@ export default class PreferencesController {
       ///: END:ONLY_INCLUDE_IF
       useExternalNameSources: true,
       useTransactionSimulations: true,
+      enableMV3TimestampSave: true,
+      // Turning OFF basic functionality toggle means turning OFF this useExternalServices flag.
+      // Whenever useExternalServices is false, certain features will be disabled.
+      // The flag is true by Default, meaning the toggle is ON by default.
+      useExternalServices: true,
       ...opts.initState,
     };
 
@@ -127,7 +134,7 @@ export default class PreferencesController {
         }
       }
       if (accounts.size > 0) {
-        this.syncAddresses(Array.from(accounts));
+        this.#syncAddresses(Array.from(accounts));
       }
     });
 
@@ -209,6 +216,16 @@ export default class PreferencesController {
     this.store.updateState({ useSafeChainsListValidation: val });
   }
 
+  toggleExternalServices(useExternalServices) {
+    this.store.updateState({ useExternalServices });
+    this.setUseTokenDetection(useExternalServices);
+    this.setUseCurrencyRateCheck(useExternalServices);
+    this.setUsePhishDetect(useExternalServices);
+    this.setUseAddressBarEnsResolution(useExternalServices);
+    this.setOpenSeaEnabled(useExternalServices);
+    this.setUseNftDetection(useExternalServices);
+  }
+
   /**
    * Setter for the `useTokenDetection` property
    *
@@ -368,24 +385,6 @@ export default class PreferencesController {
     return textDirection;
   }
 
-  /**
-   * Updates identities to only include specified addresses. Removes identities
-   * not included in addresses array
-   *
-   * @param {string[]} addresses - An array of hex addresses
-   */
-  setAddresses(addresses) {
-    const oldIdentities = this.store.getState().identities;
-
-    const identities = addresses.reduce((ids, address, index) => {
-      const oldId = oldIdentities[address] || {};
-      ids[address] = { name: `Account ${index + 1}`, address, ...oldId };
-      return ids;
-    }, {});
-
-    this.store.updateState({ identities });
-  }
-
   /**
    * Removes an address from state
    *
@@ -431,50 +430,6 @@ export default class PreferencesController {
     this.store.updateState({ identities });
   }
 
-  /**
-   * Synchronizes identity entries with known accounts.
-   * Removes any unknown identities, and returns the resulting selected address.
-   *
-   * @param {Array<string>} addresses - known to the vault.
-   * @returns {string} selectedAddress the selected address.
-   */
-  syncAddresses(addresses) {
-    if (!Array.isArray(addresses) || addresses.length === 0) {
-      throw new Error('Expected non-empty array of addresses. Error #11201');
-    }
-
-    const { identities, lostIdentities } = this.store.getState();
-
-    const newlyLost = {};
-    Object.keys(identities).forEach((identity) => {
-      if (!addresses.includes(identity)) {
-        newlyLost[identity] = identities[identity];
-        delete identities[identity];
-      }
-    });
-
-    // Identities are no longer present.
-    if (Object.keys(newlyLost).length > 0) {
-      // store lost accounts
-      Object.keys(newlyLost).forEach((key) => {
-        lostIdentities[key] = newlyLost[key];
-      });
-    }
-
-    this.store.updateState({ identities, lostIdentities });
-    this.addAddresses(addresses);
-
-    // If the selected account is no longer valid,
-    // select an arbitrary other account:
-    let selected = this.getSelectedAddress();
-    if (!addresses.includes(selected)) {
-      [selected] = addresses;
-      this.setSelectedAddress(selected);
-    }
-
-    return selected;
-  }
-
   /**
    * Setter for the `selectedAddress` property
    *
@@ -672,6 +627,10 @@ export default class PreferencesController {
     this.store.updateState({ incomingTransactionsPreferences: updatedValue });
   }
 
+  setServiceWorkerKeepAlivePreference(value) {
+    this.store.updateState({ enableMV3TimestampSave: value });
+  }
+
   getRpcMethodPreferences() {
     return this.store.getState().disabledRpcMethodPreferences;
   }
@@ -681,4 +640,40 @@ export default class PreferencesController {
     this.store.updateState({ snapsAddSnapAccountModalDismissed: value });
   }
   ///: END:ONLY_INCLUDE_IF
+
+  /**
+   * Synchronizes identity entries with known accounts.
+   * Removes any unknown identities, and returns the resulting selected address.
+   *
+   * @param {Array<string>} addresses - known to the vault.
+   * @returns {string} selectedAddress the selected address.
+   */
+  #syncAddresses(addresses) {
+    if (!Array.isArray(addresses) || addresses.length === 0) {
+      throw new Error('Expected non-empty array of addresses. Error #11201');
+    }
+
+    const { identities, lostIdentities } = this.store.getState();
+
+    Object.keys(identities).forEach((identity) => {
+      if (!addresses.includes(identity)) {
+        // store lost accounts
+        lostIdentities[identity] = identities[identity];
+        delete identities[identity];
+      }
+    });
+
+    this.store.updateState({ identities, lostIdentities });
+    this.addAddresses(addresses);
+
+    // If the selected account is no longer valid,
+    // select an arbitrary other account:
+    let selected = this.getSelectedAddress();
+    if (!addresses.includes(selected)) {
+      [selected] = addresses;
+      this.setSelectedAddress(selected);
+    }
+
+    return selected;
+  }
 }
diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js
index 4f666c03e527..6425139c5049 100644
--- a/app/scripts/controllers/preferences.test.js
+++ b/app/scripts/controllers/preferences.test.js
@@ -76,44 +76,20 @@ describe('preferences controller', () => {
     });
   });
 
-  describe('setAddresses', () => {
-    it('should keep a map of addresses to names and addresses in the store', () => {
-      preferencesController.setAddresses(['0xda22le', '0x7e57e2']);
-
-      const { identities } = preferencesController.store.getState();
-      expect(identities).toStrictEqual({
-        '0xda22le': {
-          name: 'Account 1',
-          address: '0xda22le',
-        },
-        '0x7e57e2': {
-          name: 'Account 2',
-          address: '0x7e57e2',
-        },
-      });
-    });
-
-    it('should replace its list of addresses', () => {
-      preferencesController.setAddresses(['0xda22le', '0x7e57e2']);
-      preferencesController.setAddresses(['0xda22le77', '0x7e57e277']);
-
-      const { identities } = preferencesController.store.getState();
-      expect(identities).toStrictEqual({
-        '0xda22le77': {
-          name: 'Account 1',
-          address: '0xda22le77',
-        },
-        '0x7e57e277': {
-          name: 'Account 2',
-          address: '0x7e57e277',
-        },
-      });
-    });
-  });
-
   describe('removeAddress', () => {
     it('should remove an address from state', () => {
-      preferencesController.setAddresses(['0xda22le', '0x7e57e2']);
+      preferencesController.store.updateState({
+        identities: {
+          '0xda22le': {
+            name: 'Account 1',
+            address: '0xda22le',
+          },
+          '0x7e57e2': {
+            name: 'Account 2',
+            address: '0x7e57e2',
+          },
+        },
+      });
 
       preferencesController.removeAddress('0xda22le');
 
@@ -123,10 +99,22 @@ describe('preferences controller', () => {
     });
 
     it('should switch accounts if the selected address is removed', () => {
-      preferencesController.setAddresses(['0xda22le', '0x7e57e2']);
-
+      preferencesController.store.updateState({
+        identities: {
+          '0xda22le': {
+            name: 'Account 1',
+            address: '0xda22le',
+          },
+          '0x7e57e2': {
+            name: 'Account 2',
+            address: '0x7e57e2',
+          },
+        },
+      });
       preferencesController.setSelectedAddress('0x7e57e2');
+
       preferencesController.removeAddress('0x7e57e2');
+
       expect(preferencesController.getSelectedAddress()).toStrictEqual(
         '0xda22le',
       );
@@ -135,16 +123,21 @@ describe('preferences controller', () => {
 
   describe('setAccountLabel', () => {
     it('should update a label for the given account', () => {
-      preferencesController.setAddresses(['0xda22le', '0x7e57e2']);
-
-      expect(
-        preferencesController.store.getState().identities['0xda22le'],
-      ).toStrictEqual({
-        name: 'Account 1',
-        address: '0xda22le',
+      preferencesController.store.updateState({
+        identities: {
+          '0xda22le': {
+            name: 'Account 1',
+            address: '0xda22le',
+          },
+          '0x7e57e2': {
+            name: 'Account 2',
+            address: '0x7e57e2',
+          },
+        },
       });
 
       preferencesController.setAccountLabel('0xda22le', 'Dazzle');
+
       expect(
         preferencesController.store.getState().identities['0xda22le'],
       ).toStrictEqual({
@@ -237,10 +230,10 @@ describe('preferences controller', () => {
   });
 
   describe('setUseTokenDetection', function () {
-    it('should default to false', function () {
+    it('should default to true for new users', function () {
       const state = preferencesController.store.getState();
 
-      expect(state.useTokenDetection).toStrictEqual(false);
+      expect(state.useTokenDetection).toStrictEqual(true);
     });
 
     it('should set the useTokenDetection property in state', () => {
@@ -249,6 +242,22 @@ describe('preferences controller', () => {
         preferencesController.store.getState().useTokenDetection,
       ).toStrictEqual(true);
     });
+
+    it('should keep initial value of useTokenDetection for existing users', function () {
+      const preferencesControllerExistingUser = new PreferencesController({
+        initLangCode: 'en_US',
+        tokenListController,
+        initState: {
+          useTokenDetection: false,
+        },
+        networkConfigurations: NETWORK_CONFIGURATION_DATA,
+        onKeyringStateChange: (listener) => {
+          onKeyringStateChangeListener = listener;
+        },
+      });
+      const state = preferencesControllerExistingUser.store.getState();
+      expect(state.useTokenDetection).toStrictEqual(false);
+    });
   });
 
   describe('setUseNftDetection', () => {
@@ -363,7 +372,6 @@ describe('preferences controller', () => {
         [NETWORK_CONFIGURATION_DATA[addedNonTestNetworks[1]].chainId]: true,
         [CHAIN_IDS.GOERLI]: true,
         [CHAIN_IDS.SEPOLIA]: true,
-        [CHAIN_IDS.LINEA_GOERLI]: true,
         [CHAIN_IDS.LINEA_SEPOLIA]: true,
       });
     });
@@ -381,7 +389,6 @@ describe('preferences controller', () => {
         [NETWORK_CONFIGURATION_DATA[addedNonTestNetworks[1]].chainId]: true,
         [CHAIN_IDS.GOERLI]: true,
         [CHAIN_IDS.SEPOLIA]: true,
-        [CHAIN_IDS.LINEA_GOERLI]: true,
         [CHAIN_IDS.LINEA_SEPOLIA]: true,
       });
     });
@@ -436,4 +443,19 @@ describe('preferences controller', () => {
       ).toStrictEqual(false);
     });
   });
+
+  describe('setServiceWorkerKeepAlivePreference', () => {
+    it('should default to true', () => {
+      expect(
+        preferencesController.store.getState().enableMV3TimestampSave,
+      ).toStrictEqual(true);
+    });
+
+    it('should set the setServiceWorkerKeepAlivePreference property in state', () => {
+      preferencesController.setServiceWorkerKeepAlivePreference(false);
+      expect(
+        preferencesController.store.getState().enableMV3TimestampSave,
+      ).toStrictEqual(false);
+    });
+  });
 });
diff --git a/app/scripts/controllers/push-platform-notifications/push-platform-notifications.test.ts b/app/scripts/controllers/push-platform-notifications/push-platform-notifications.test.ts
new file mode 100644
index 000000000000..a237fd0a4684
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/push-platform-notifications.test.ts
@@ -0,0 +1,152 @@
+import { ControllerMessenger } from '@metamask/base-controller';
+import type { AuthenticationControllerGetBearerToken } from '../authentication/authentication-controller';
+import { PushPlatformNotificationsController } from './push-platform-notifications';
+
+import * as services from './services/services';
+import type {
+  PushPlatformNotificationsControllerMessenger,
+  PushPlatformNotificationsControllerState,
+} from './push-platform-notifications';
+
+const MOCK_JWT = 'mockJwt';
+const MOCK_FCM_TOKEN = 'mockFcmToken';
+const MOCK_TRIGGERS = ['uuid1', 'uuid2'];
+
+describe('PushPlatformNotificationsController', () => {
+  describe('enablePushNotifications', () => {
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should update the state with the fcmToken', async () => {
+      await withController(async ({ controller, messenger }) => {
+        mockAuthBearerTokenCall(messenger);
+        jest
+          .spyOn(services, 'activatePushNotifications')
+          .mockResolvedValue(MOCK_FCM_TOKEN);
+
+        await controller.enablePushNotifications(MOCK_TRIGGERS);
+        expect(controller.state.fcmToken).toBe(MOCK_FCM_TOKEN);
+      });
+    });
+
+    it('should fail if a jwt token is not provided', async () => {
+      await withController(async ({ messenger, controller }) => {
+        mockAuthBearerTokenCall(messenger).mockResolvedValue(
+          null as unknown as string,
+        );
+        await expect(controller.enablePushNotifications([])).rejects.toThrow();
+      });
+    });
+  });
+
+  describe('disablePushNotifications', () => {
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should update the state removing the fcmToken', async () => {
+      await withController(async ({ messenger, controller }) => {
+        mockAuthBearerTokenCall(messenger);
+        await controller.disablePushNotifications(MOCK_TRIGGERS);
+        expect(controller.state.fcmToken).toBe('');
+      });
+    });
+
+    it('should fail if a jwt token is not provided', async () => {
+      await withController(async ({ messenger, controller }) => {
+        mockAuthBearerTokenCall(messenger).mockResolvedValue(
+          null as unknown as string,
+        );
+        await expect(controller.disablePushNotifications([])).rejects.toThrow();
+      });
+    });
+  });
+
+  describe('updateTriggerPushNotifications', () => {
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should call updateTriggerPushNotifications with the correct parameters', async () => {
+      await withController(async ({ messenger, controller }) => {
+        mockAuthBearerTokenCall(messenger);
+        const spy = jest
+          .spyOn(services, 'updateTriggerPushNotifications')
+          .mockResolvedValue(true);
+
+        await controller.updateTriggerPushNotifications(MOCK_TRIGGERS);
+
+        expect(spy).toHaveBeenCalledWith(
+          controller.state.fcmToken,
+          MOCK_JWT,
+          MOCK_TRIGGERS,
+        );
+      });
+    });
+  });
+});
+
+// Test helper functions
+
+type WithControllerCallback<ReturnValue> = ({
+  controller,
+  initialState,
+  messenger,
+}: {
+  controller: PushPlatformNotificationsController;
+  initialState: PushPlatformNotificationsControllerState;
+  messenger: PushPlatformNotificationsControllerMessenger;
+}) => Promise<ReturnValue> | ReturnValue;
+
+function buildMessenger() {
+  return new ControllerMessenger<
+    AuthenticationControllerGetBearerToken,
+    never
+  >();
+}
+
+function buildPushPlatformNotificationsControllerMessenger(
+  messenger = buildMessenger(),
+) {
+  return messenger.getRestricted({
+    name: 'PushPlatformNotificationsController',
+    allowedActions: ['AuthenticationController:getBearerToken'],
+  }) as PushPlatformNotificationsControllerMessenger;
+}
+
+async function withController<ReturnValue>(
+  fn: WithControllerCallback<ReturnValue>,
+): Promise<ReturnValue> {
+  const messenger = buildPushPlatformNotificationsControllerMessenger();
+  const controller = new PushPlatformNotificationsController({
+    messenger,
+    state: { fcmToken: '' },
+  });
+
+  return await fn({
+    controller,
+    initialState: controller.state,
+    messenger,
+  });
+}
+
+function mockAuthBearerTokenCall(
+  messenger: PushPlatformNotificationsControllerMessenger,
+) {
+  type Fn = AuthenticationControllerGetBearerToken['handler'];
+  const mockAuthGetBearerToken = jest
+    .fn<ReturnType<Fn>, Parameters<Fn>>()
+    .mockResolvedValue(MOCK_JWT);
+
+  jest.spyOn(messenger, 'call').mockImplementation((...args) => {
+    const [actionType] = args;
+    if (actionType === 'AuthenticationController:getBearerToken') {
+      return mockAuthGetBearerToken();
+    }
+
+    throw new Error('MOCK - unsupported messenger call mock');
+  });
+
+  return mockAuthGetBearerToken;
+}
diff --git a/app/scripts/controllers/push-platform-notifications/push-platform-notifications.ts b/app/scripts/controllers/push-platform-notifications/push-platform-notifications.ts
new file mode 100644
index 000000000000..80c799074853
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/push-platform-notifications.ts
@@ -0,0 +1,182 @@
+import {
+  BaseController,
+  RestrictedControllerMessenger,
+  ControllerGetStateAction,
+} from '@metamask/base-controller';
+import log from 'loglevel';
+
+import type { AuthenticationControllerGetBearerToken } from '../authentication/authentication-controller';
+import {
+  activatePushNotifications,
+  deactivatePushNotifications,
+  updateTriggerPushNotifications,
+} from './services/services';
+
+const controllerName = 'PushPlatformNotificationsController';
+
+export type PushPlatformNotificationsControllerState = {
+  fcmToken: string;
+};
+
+export declare type PushPlatformNotificationsControllerEnablePushNotificationsAction =
+  {
+    type: `${typeof controllerName}:enablePushNotifications`;
+    handler: PushPlatformNotificationsController['enablePushNotifications'];
+  };
+
+export declare type PushPlatformNotificationsControllerDisablePushNotificationsAction =
+  {
+    type: `${typeof controllerName}:disablePushNotifications`;
+    handler: PushPlatformNotificationsController['disablePushNotifications'];
+  };
+
+export type PushPlatformNotificationsControllerMessengerActions =
+  | PushPlatformNotificationsControllerEnablePushNotificationsAction
+  | PushPlatformNotificationsControllerDisablePushNotificationsAction
+  | ControllerGetStateAction<'state', PushPlatformNotificationsControllerState>;
+
+type AllowedActions = AuthenticationControllerGetBearerToken;
+
+export type PushPlatformNotificationsControllerMessenger =
+  RestrictedControllerMessenger<
+    typeof controllerName,
+    PushPlatformNotificationsControllerMessengerActions | AllowedActions,
+    never,
+    AllowedActions['type'],
+    never
+  >;
+
+const metadata = {
+  fcmToken: {
+    persist: true,
+    anonymous: true,
+  },
+};
+
+/**
+ * Manages push notifications for the application, including enabling, disabling, and updating triggers for push notifications.
+ * This controller integrates with Firebase Cloud Messaging (FCM) to handle the registration and management of push notifications.
+ * It is responsible for registering and unregistering the service worker that listens for push notifications,
+ * managing the FCM token, and communicating with the server to register or unregister the device for push notifications.
+ * Additionally, it provides functionality to update the server with new UUIDs that should trigger push notifications.
+ *
+ * @augments {BaseController<typeof controllerName, PushPlatformNotificationsControllerState, PushPlatformNotificationsControllerMessenger>}
+ */
+export class PushPlatformNotificationsController extends BaseController<
+  typeof controllerName,
+  PushPlatformNotificationsControllerState,
+  PushPlatformNotificationsControllerMessenger
+> {
+  constructor({
+    messenger,
+    state,
+  }: {
+    messenger: PushPlatformNotificationsControllerMessenger;
+    state: PushPlatformNotificationsControllerState;
+  }) {
+    super({
+      messenger,
+      metadata,
+      name: controllerName,
+      state: {
+        fcmToken: state?.fcmToken || '',
+      },
+    });
+  }
+
+  async #getAndAssertBearerToken() {
+    const bearerToken = await this.messagingSystem.call(
+      'AuthenticationController:getBearerToken',
+    );
+    if (!bearerToken) {
+      log.error(
+        'Failed to enable push notifications: BearerToken token is missing.',
+      );
+      throw new Error('BearerToken token is missing');
+    }
+
+    return bearerToken;
+  }
+
+  /**
+   * Enables push notifications for the application.
+   *
+   * This method sets up the necessary infrastructure for handling push notifications by:
+   * 1. Registering the service worker to listen for messages.
+   * 2. Fetching the Firebase Cloud Messaging (FCM) token from Firebase.
+   * 3. Sending the FCM token to the server responsible for sending notifications, to register the device.
+   *
+   * @param UUIDs - An array of UUIDs to enable push notifications for.
+   */
+  public async enablePushNotifications(UUIDs: string[]) {
+    const bearerToken = await this.#getAndAssertBearerToken();
+
+    try {
+      // 2. Call the activatePushNotifications method from PushPlatformNotificationsUtils
+      const regToken = await activatePushNotifications(bearerToken, UUIDs);
+
+      // 3. Update the state with the FCM token
+      if (regToken) {
+        this.update((state) => {
+          state.fcmToken = regToken;
+        });
+      }
+    } catch (error) {
+      log.error('Failed to enable push notifications:', error);
+      throw new Error('Failed to enable push notifications');
+    }
+  }
+
+  /**
+   * Disables push notifications for the application.
+   * This method handles the process of disabling push notifications by:
+   * 1. Unregistering the service worker to stop listening for messages.
+   * 2. Sending a request to the server to unregister the device using the FCM token.
+   * 3. Removing the FCM token from the state to complete the process.
+   *
+   * @param UUIDs - An array of UUIDs for which push notifications should be disabled.
+   */
+  public async disablePushNotifications(UUIDs: string[]) {
+    const bearerToken = await this.#getAndAssertBearerToken();
+    let isPushNotificationsDisabled: boolean;
+
+    try {
+      // 1. Send a request to the server to unregister the token/device
+      isPushNotificationsDisabled = await deactivatePushNotifications(
+        this.state.fcmToken,
+        bearerToken,
+        UUIDs,
+      );
+    } catch (error) {
+      const errorMessage = `Failed to disable push notifications: ${error}`;
+      log.error(errorMessage);
+      throw new Error(errorMessage);
+    }
+
+    // 2. Remove the FCM token from the state
+    if (isPushNotificationsDisabled) {
+      this.update((state) => {
+        state.fcmToken = '';
+      });
+    }
+  }
+
+  /**
+   * Updates the triggers for push notifications.
+   * This method is responsible for updating the server with the new set of UUIDs that should trigger push notifications.
+   * It uses the current FCM token and a BearerToken for authentication.
+   *
+   * @param UUIDs - An array of UUIDs that should trigger push notifications.
+   */
+  public async updateTriggerPushNotifications(UUIDs: string[]) {
+    const bearerToken = await this.#getAndAssertBearerToken();
+
+    try {
+      updateTriggerPushNotifications(this.state.fcmToken, bearerToken, UUIDs);
+    } catch (error) {
+      const errorMessage = `Failed to update triggers for push notifications: ${error}`;
+      log.error(errorMessage);
+      throw new Error(errorMessage);
+    }
+  }
+}
diff --git a/app/scripts/controllers/push-platform-notifications/services/services.test.ts b/app/scripts/controllers/push-platform-notifications/services/services.test.ts
new file mode 100644
index 000000000000..c15473849dfe
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/services/services.test.ts
@@ -0,0 +1,209 @@
+import * as services from './services';
+
+type MockResponse = {
+  trigger_ids: string[];
+  registration_tokens: string[];
+};
+
+const MOCK_REG_TOKEN = 'REG_TOKEN';
+const MOCK_NEW_REG_TOKEN = 'NEW_REG_TOKEN';
+const MOCK_TRIGGERS = ['1', '2', '3'];
+const MOCK_RESPONSE: MockResponse = {
+  trigger_ids: ['1', '2', '3'],
+  registration_tokens: ['reg-token-1', 'reg-token-2'],
+};
+const MOCK_JWT = 'MOCK_JWT';
+
+describe('PushPlatformNotificationsServices', () => {
+  describe('getPushNotificationLinks', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    const utils = services;
+
+    it('Should return reg token links', async () => {
+      jest
+        .spyOn(services, 'getPushNotificationLinks')
+        .mockResolvedValue(MOCK_RESPONSE);
+
+      const res = await services.getPushNotificationLinks(MOCK_JWT);
+
+      expect(res).toBeDefined();
+      expect(res?.trigger_ids).toBeDefined();
+      expect(res?.registration_tokens).toBeDefined();
+    });
+
+    it('Should return null if api call fails', async () => {
+      jest.spyOn(services, 'getPushNotificationLinks').mockResolvedValue(null);
+
+      const res = await utils.getPushNotificationLinks(MOCK_JWT);
+      expect(res).toBeNull();
+    });
+  });
+
+  describe('updateLinksAPI', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('Should return true if links are updated', async () => {
+      jest.spyOn(services, 'updateLinksAPI').mockResolvedValue(true);
+
+      const res = await services.updateLinksAPI(MOCK_JWT, MOCK_TRIGGERS, [
+        MOCK_NEW_REG_TOKEN,
+      ]);
+
+      expect(res).toBe(true);
+    });
+
+    it('Should return false if links are not updated', async () => {
+      jest.spyOn(services, 'updateLinksAPI').mockResolvedValue(false);
+
+      const res = await services.updateLinksAPI(MOCK_JWT, MOCK_TRIGGERS, [
+        MOCK_NEW_REG_TOKEN,
+      ]);
+
+      expect(res).toBe(false);
+    });
+  });
+
+  describe('activatePushNotifications()', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should append registration token when enabling push', async () => {
+      jest
+        .spyOn(services, 'activatePushNotifications')
+        .mockResolvedValue(MOCK_NEW_REG_TOKEN);
+      const res = await services.activatePushNotifications(
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+
+      expect(res).toBe(MOCK_NEW_REG_TOKEN);
+    });
+
+    it('should fail if unable to get existing notification links', async () => {
+      jest
+        .spyOn(services, 'getPushNotificationLinks')
+        .mockResolvedValueOnce(null);
+      const res = await services.activatePushNotifications(
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+      expect(res).toBeNull();
+    });
+
+    it('should fail if unable to create new reg token', async () => {
+      jest.spyOn(services, 'createRegToken').mockResolvedValueOnce(null);
+      const res = await services.activatePushNotifications(
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+      expect(res).toBeNull();
+    });
+
+    it('should fail if unable to update links', async () => {
+      jest.spyOn(services, 'updateLinksAPI').mockResolvedValueOnce(false);
+      const res = await services.activatePushNotifications(
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+      expect(res).toBeNull();
+    });
+
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+  });
+
+  describe('deactivatePushNotifications()', () => {
+    it('should fail if unable to get existing notification links', async () => {
+      jest
+        .spyOn(services, 'getPushNotificationLinks')
+        .mockResolvedValueOnce(null);
+
+      const res = await services.deactivatePushNotifications(
+        MOCK_REG_TOKEN,
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+
+      expect(res).toBe(false);
+    });
+
+    it('should fail if unable to update links', async () => {
+      jest
+        .spyOn(services, 'getPushNotificationLinks')
+        .mockResolvedValue(MOCK_RESPONSE);
+      jest.spyOn(services, 'updateLinksAPI').mockResolvedValue(false);
+
+      const res = await services.deactivatePushNotifications(
+        MOCK_REG_TOKEN,
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+
+      expect(res).toBe(false);
+    });
+
+    it('should fail if unable to delete reg token', async () => {
+      jest
+        .spyOn(services, 'getPushNotificationLinks')
+        .mockResolvedValueOnce(MOCK_RESPONSE);
+      jest.spyOn(services, 'deleteRegToken').mockResolvedValue(false);
+
+      const res = await services.deactivatePushNotifications(
+        MOCK_REG_TOKEN,
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+
+      expect(res).toBe(false);
+    });
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+  });
+
+  describe('updateTriggerPushNotifications()', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should update triggers for push notifications', async () => {
+      jest
+        .spyOn(services, 'updateTriggerPushNotifications')
+        .mockResolvedValue(true);
+
+      const res = await services.updateTriggerPushNotifications(
+        MOCK_REG_TOKEN,
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+
+      expect(res).toBe(true);
+    });
+
+    it('should fail if unable to update triggers', async () => {
+      jest
+        .spyOn(services, 'updateTriggerPushNotifications')
+        .mockResolvedValue(false);
+
+      const res = await services.updateTriggerPushNotifications(
+        MOCK_REG_TOKEN,
+        MOCK_JWT,
+        MOCK_TRIGGERS,
+      );
+
+      expect(res).toBe(false);
+    });
+
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+  });
+});
diff --git a/app/scripts/controllers/push-platform-notifications/services/services.ts b/app/scripts/controllers/push-platform-notifications/services/services.ts
new file mode 100644
index 000000000000..c73f11f6cc66
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/services/services.ts
@@ -0,0 +1,278 @@
+import { getToken, deleteToken } from 'firebase/messaging';
+import type { FirebaseApp } from 'firebase/app';
+import { getApp, initializeApp } from 'firebase/app';
+import { getMessaging, onBackgroundMessage } from 'firebase/messaging/sw';
+import type { Messaging, MessagePayload } from 'firebase/messaging/sw';
+import log from 'loglevel';
+import { onPushNotification } from '../utils/get-notification-message';
+
+const url = process.env.PUSH_NOTIFICATIONS_SERVICE_URL;
+const REGISTRATION_TOKENS_ENDPOINT = `${url}/v1/link`;
+const sw = self as unknown as ServiceWorkerGlobalScope;
+
+export type LinksResult = {
+  trigger_ids: string[];
+  registration_tokens: string[];
+};
+
+/**
+ * Attempts to retrieve an existing Firebase app instance. If no instance exists, it initializes a new app with the provided configuration.
+ *
+ * @returns The Firebase app instance.
+ */
+export async function createFirebaseApp(): Promise<FirebaseApp> {
+  try {
+    return getApp();
+  } catch {
+    const firebaseConfig = {
+      apiKey: process.env.FIREBASE_API_KEY,
+      authDomain: process.env.FIREBASE_AUTH_DOMAIN,
+      storageBucket: process.env.FIREBASE_STORAGE_BUCKET,
+      projectId: process.env.FIREBASE_PROJECT_ID,
+      messagingSenderId: process.env.FIREBASE_MESSAGING_SENDER_ID,
+      appId: process.env.FIREBASE_APP_ID,
+      measurementId: process.env.FIREBASE_MEASUREMENT_ID,
+    };
+    return initializeApp(firebaseConfig);
+  }
+}
+
+/**
+ * Retrieves the Firebase Messaging service instance.
+ *
+ * This function first ensures a Firebase app instance is created or retrieved by calling `createFirebaseApp`.
+ * It then initializes and returns the Firebase Messaging service associated with the Firebase app.
+ *
+ * @returns A promise that resolves with the Firebase Messaging service instance.
+ */
+export async function getFirebaseMessaging(): Promise<Messaging> {
+  const app = await createFirebaseApp();
+  return getMessaging(app);
+}
+
+/**
+ * Creates a registration token for Firebase Cloud Messaging.
+ *
+ * @returns A promise that resolves with the registration token or null if an error occurs.
+ */
+export async function createRegToken(): Promise<string | null> {
+  try {
+    const messaging = await getFirebaseMessaging();
+    const token = await getToken(messaging, {
+      serviceWorkerRegistration: sw.registration,
+      vapidKey: process.env.VAPID_KEY,
+    });
+    return token;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Deletes the Firebase Cloud Messaging registration token.
+ *
+ * @returns A promise that resolves with true if the token was successfully deleted, false otherwise.
+ */
+export async function deleteRegToken(): Promise<boolean> {
+  try {
+    const messaging = await getFirebaseMessaging();
+    await deleteToken(messaging);
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
+/**
+ * Fetches push notification links from a remote endpoint using a BearerToken for authorization.
+ *
+ * @param bearerToken - The JSON Web Token used for authorization.
+ * @returns A promise that resolves with the links result or null if an error occurs.
+ */
+export async function getPushNotificationLinks(
+  bearerToken: string,
+): Promise<LinksResult | null> {
+  try {
+    const response = await fetch(REGISTRATION_TOKENS_ENDPOINT, {
+      headers: { Authorization: `Bearer ${bearerToken}` },
+    });
+    if (!response.ok) {
+      throw new Error('Failed to fetch links');
+    }
+    return response.json() as Promise<LinksResult>;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Updates the push notification links on a remote API.
+ *
+ * @param bearerToken - The JSON Web Token used for authorization.
+ * @param triggers - An array of trigger identifiers.
+ * @param regTokens - An array of registration tokens.
+ * @returns A promise that resolves with true if the update was successful, false otherwise.
+ */
+export async function updateLinksAPI(
+  bearerToken: string,
+  triggers: string[],
+  regTokens: string[],
+): Promise<boolean> {
+  try {
+    const body: LinksResult = {
+      trigger_ids: triggers,
+      registration_tokens: regTokens,
+    };
+    const response = await fetch(
+      `${process.env.PUSH_NOTIFICATIONS_SERVICE_URL}/v1/link`,
+      {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${bearerToken}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(body),
+      },
+    );
+    return response.status === 200;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Enables push notifications by registering the device and linking triggers.
+ *
+ * @param bearerToken - The JSON Web Token used for authorization.
+ * @param triggers - An array of trigger identifiers.
+ * @returns A promise that resolves with an object containing the success status and the BearerToken token.
+ */
+export async function activatePushNotifications(
+  bearerToken: string,
+  triggers: string[],
+): Promise<string | null> {
+  const notificationLinks = await getPushNotificationLinks(bearerToken);
+  if (!notificationLinks) {
+    return null;
+  }
+
+  const regToken = await createRegToken().catch(() => null);
+  if (!regToken) {
+    return null;
+  }
+
+  const messaging = await getFirebaseMessaging();
+
+  onBackgroundMessage(
+    messaging,
+    async (payload: MessagePayload): Promise<void> => {
+      const typedPayload = payload;
+
+      // if the payload does not contain data, do nothing
+      try {
+        const notificationData = typedPayload?.data?.data
+          ? JSON.parse(typedPayload?.data?.data)
+          : undefined;
+        if (!notificationData) {
+          return;
+        }
+
+        await onPushNotification(notificationData);
+      } catch (error) {
+        // Do Nothing, cannot parse a bad notification
+        log.error('Unable to send push notification:', {
+          notification: payload?.data?.data,
+          error,
+        });
+        throw new Error('Unable to send push notification');
+      }
+    },
+  );
+
+  const newRegTokens = new Set(notificationLinks.registration_tokens);
+  newRegTokens.add(regToken);
+
+  await updateLinksAPI(bearerToken, triggers, Array.from(newRegTokens));
+  return regToken;
+}
+
+/**
+ * Disables push notifications by removing the registration token and unlinking triggers.
+ *
+ * @param regToken - The registration token to be removed.
+ * @param bearerToken - The JSON Web Token used for authorization.
+ * @param triggers - An array of trigger identifiers to be unlinked.
+ * @returns A promise that resolves with true if notifications were successfully disabled, false otherwise.
+ */
+export async function deactivatePushNotifications(
+  regToken: string,
+  bearerToken: string,
+  triggers: string[],
+): Promise<boolean> {
+  // if we don't have a reg token, then we can early return
+  if (!regToken) {
+    return true;
+  }
+
+  const notificationLinks = await getPushNotificationLinks(bearerToken);
+  if (!notificationLinks) {
+    return false;
+  }
+
+  const regTokenSet = new Set(notificationLinks.registration_tokens);
+  regTokenSet.delete(regToken);
+
+  const isTokenRemovedFromAPI = await updateLinksAPI(
+    bearerToken,
+    triggers,
+    Array.from(regTokenSet),
+  );
+  if (!isTokenRemovedFromAPI) {
+    return false;
+  }
+
+  const isTokenRemovedFromFCM = await deleteRegToken();
+  if (!isTokenRemovedFromFCM) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Updates the triggers linked to push notifications for a given registration token.
+ *
+ * @param regToken - The registration token to update triggers for.
+ * @param bearerToken - The JSON Web Token used for authorization.
+ * @param triggers - An array of new trigger identifiers to link.
+ * @returns A promise that resolves with true if the triggers were successfully updated, false otherwise.
+ */
+export async function updateTriggerPushNotifications(
+  regToken: string,
+  bearerToken: string,
+  triggers: string[],
+): Promise<boolean> {
+  const notificationLinks = await getPushNotificationLinks(bearerToken);
+  if (!notificationLinks) {
+    return false;
+  }
+
+  // Create new registration token if doesn't exist
+  const regTokenSet = new Set(notificationLinks.registration_tokens);
+  if (!regToken || !regTokenSet.has(regToken)) {
+    await deleteRegToken();
+    const newRegToken = await createRegToken();
+    if (!newRegToken) {
+      throw new Error('Failed to create a new registration token');
+    }
+    regTokenSet.add(newRegToken);
+  }
+
+  const isTriggersLinkedToPushNotifications = await updateLinksAPI(
+    bearerToken,
+    triggers,
+    Array.from(regTokenSet),
+  );
+
+  return isTriggersLinkedToPushNotifications;
+}
diff --git a/app/scripts/controllers/push-platform-notifications/types/firebase.ts b/app/scripts/controllers/push-platform-notifications/types/firebase.ts
new file mode 100644
index 000000000000..91dc2c2e4d6f
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/types/firebase.ts
@@ -0,0 +1,46 @@
+export declare type Messaging = {
+  app: FirebaseApp;
+};
+
+export declare type FirebaseApp = {
+  readonly name: string;
+  readonly options: FirebaseOptions;
+  automaticDataCollectionEnabled: boolean;
+};
+
+export declare type FirebaseOptions = {
+  apiKey?: string;
+  authDomain?: string;
+  databaseURL?: string;
+  projectId?: string;
+  storageBucket?: string;
+  messagingSenderId?: string;
+  appId?: string;
+  measurementId?: string;
+};
+
+export type NotificationPayload = {
+  title?: string;
+  body?: string;
+  image?: string;
+  icon?: string;
+};
+
+export type FcmOptions = {
+  link?: string;
+  analyticsLabel?: string;
+};
+
+export type MessagePayload = {
+  notification?: NotificationPayload;
+  data?: { [key: string]: string };
+  fcmOptions?: FcmOptions;
+  from: string;
+  collapseKey: string;
+  messageId: string;
+};
+
+export type GetTokenOptions = {
+  vapidKey?: string;
+  serviceWorkerRegistration?: ServiceWorkerRegistration;
+};
diff --git a/app/scripts/controllers/push-platform-notifications/utils/get-notification-data.test.ts b/app/scripts/controllers/push-platform-notifications/utils/get-notification-data.test.ts
new file mode 100644
index 000000000000..2ffbe89fdd9e
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/utils/get-notification-data.test.ts
@@ -0,0 +1,80 @@
+import {
+  formatAmount,
+  getAmount,
+  getLeadingZeroCount,
+} from './get-notification-data';
+
+describe('getNotificationData - formatAmount() tests', () => {
+  test('Should format large numbers', () => {
+    expect(formatAmount(1000)).toBe('1K');
+    expect(formatAmount(1500)).toBe('1.5K');
+    expect(formatAmount(1000000)).toBe('1M');
+    expect(formatAmount(1000000000)).toBe('1B');
+    expect(formatAmount(1000000000000)).toBe('1T');
+    expect(formatAmount(1234567)).toBe('1.23M');
+  });
+
+  test('Should format smaller numbers (<1000) with custom decimal place', () => {
+    const formatOptions = { decimalPlaces: 18 };
+    expect(formatAmount(100.0012, formatOptions)).toBe('100.0012');
+    expect(formatAmount(100.001200001, formatOptions)).toBe('100.001200001');
+    expect(formatAmount(1e-18, formatOptions)).toBe('0.000000000000000001');
+    expect(formatAmount(1e-19, formatOptions)).toBe('0'); // number is smaller than decimals given, hence 0
+  });
+
+  test('Should format small numbers (<1000) up to 4 decimals otherwise uses ellipses', () => {
+    const formatOptions = { shouldEllipse: true };
+    expect(formatAmount(100.1, formatOptions)).toBe('100.1');
+    expect(formatAmount(100.01, formatOptions)).toBe('100.01');
+    expect(formatAmount(100.001, formatOptions)).toBe('100.001');
+    expect(formatAmount(100.0001, formatOptions)).toBe('100.0001');
+    expect(formatAmount(100.00001, formatOptions)).toBe('100.0000...'); // since number is has >4 decimals, it will be truncated
+    expect(formatAmount(0.00001, formatOptions)).toBe('0.0000...'); // since number is has >4 decimals, it will be truncated
+  });
+
+  test('Should format small numbers (<1000) to custom decimal places and ellipse', () => {
+    const formatOptions = { decimalPlaces: 2, shouldEllipse: true };
+    expect(formatAmount(100.1, formatOptions)).toBe('100.1');
+    expect(formatAmount(100.01, formatOptions)).toBe('100.01');
+    expect(formatAmount(100.001, formatOptions)).toBe('100.00...');
+    expect(formatAmount(100.0001, formatOptions)).toBe('100.00...');
+    expect(formatAmount(100.00001, formatOptions)).toBe('100.00...'); // since number is has >2 decimals, it will be truncated
+    expect(formatAmount(0.00001, formatOptions)).toBe('0.00...'); // since number is has >2 decimals, it will be truncated
+  });
+});
+
+describe('getNotificationData - getAmount() tests', () => {
+  test('Should get formatted amount for larger numbers', () => {
+    expect(getAmount('1', '2')).toBe('0.01');
+    expect(getAmount('10', '2')).toBe('0.1');
+    expect(getAmount('100', '2')).toBe('1');
+    expect(getAmount('1000', '2')).toBe('10');
+    expect(getAmount('10000', '2')).toBe('100');
+    expect(getAmount('100000', '2')).toBe('1K');
+    expect(getAmount('1000000', '2')).toBe('10K');
+  });
+  test('Should get formatted amount for small/decimal numbers', () => {
+    const formatOptions = { shouldEllipse: true };
+    expect(getAmount('100000', '5', formatOptions)).toBe('1');
+    expect(getAmount('100001', '5', formatOptions)).toBe('1.0000...');
+    expect(getAmount('10000', '5', formatOptions)).toBe('0.1');
+    expect(getAmount('1000', '5', formatOptions)).toBe('0.01');
+    expect(getAmount('100', '5', formatOptions)).toBe('0.001');
+    expect(getAmount('10', '5', formatOptions)).toBe('0.0001');
+    expect(getAmount('1', '5', formatOptions)).toBe('0.0000...');
+  });
+});
+
+describe('getNotificationData - getLeadingZeroCount() tests', () => {
+  test('Should handle all test cases', () => {
+    expect(getLeadingZeroCount(0)).toBe(0);
+    expect(getLeadingZeroCount(-1)).toBe(0);
+    expect(getLeadingZeroCount(1e-1)).toBe(0);
+
+    expect(getLeadingZeroCount('1.01')).toBe(1);
+    expect(getLeadingZeroCount('3e-2')).toBe(1);
+    expect(getLeadingZeroCount('100.001e1')).toBe(1);
+
+    expect(getLeadingZeroCount('0.00120043')).toBe(2);
+  });
+});
diff --git a/app/scripts/controllers/push-platform-notifications/utils/get-notification-data.ts b/app/scripts/controllers/push-platform-notifications/utils/get-notification-data.ts
new file mode 100644
index 000000000000..f95149c54c19
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/utils/get-notification-data.ts
@@ -0,0 +1,90 @@
+import { BigNumber } from 'bignumber.js';
+import { calcTokenAmount } from '../../../../../shared/lib/transactions-controller-utils';
+
+type FormatOptions = {
+  decimalPlaces?: number;
+  shouldEllipse?: boolean;
+};
+const defaultFormatOptions = {
+  decimalPlaces: 4,
+};
+
+/**
+ * Calculates the number of leading zeros in the fractional part of a number.
+ *
+ * This function converts a number or a string representation of a number into
+ * its decimal form and then counts the number of leading zeros present in the
+ * fractional part of the number. This is useful for determining the precision
+ * of very small numbers.
+ *
+ * @param num - The number to analyze, which can be in the form
+ * of a number or a string.
+ * @returns The count of leading zeros in the fractional part of the number.
+ */
+export const getLeadingZeroCount = (num: number | string) => {
+  const numToString = new BigNumber(num, 10).toString(10);
+  const fractionalPart = numToString.split('.')[1] ?? '';
+  return fractionalPart.match(/^0*/u)?.[0]?.length || 0;
+};
+
+/**
+ * This formats a number using Intl
+ * It abbreviates large numbers (using K, M, B, T)
+ * And abbreviates small numbers in 2 ways:
+ * - Will format to the given number of decimal places
+ * - Will format up to 4 decimal places
+ * - Will ellipse the number if longer than given decimal places
+ *
+ * @param numericAmount - The number to format
+ * @param opts - The options to use when formatting
+ * @returns The formatted number
+ */
+export const formatAmount = (numericAmount: number, opts?: FormatOptions) => {
+  // create options with defaults
+  const options = { ...defaultFormatOptions, ...opts };
+
+  const leadingZeros = getLeadingZeroCount(numericAmount);
+  const isDecimal = numericAmount.toString().includes('.') || leadingZeros > 0;
+  const isLargeNumber = numericAmount > 999;
+
+  const handleShouldEllipse = (decimalPlaces: number) =>
+    Boolean(options?.shouldEllipse) && leadingZeros >= decimalPlaces;
+
+  if (isLargeNumber) {
+    return Intl.NumberFormat('en-US', {
+      notation: 'compact',
+      compactDisplay: 'short',
+      maximumFractionDigits: 2,
+    }).format(numericAmount);
+  }
+
+  if (isDecimal) {
+    const ellipse = handleShouldEllipse(options.decimalPlaces);
+    const formattedValue = Intl.NumberFormat('en-US', {
+      minimumFractionDigits: ellipse ? options.decimalPlaces : undefined,
+      maximumFractionDigits: options.decimalPlaces,
+    }).format(numericAmount);
+
+    return ellipse ? `${formattedValue}...` : formattedValue;
+  }
+
+  // Default to showing the raw amount
+  return numericAmount.toString();
+};
+
+export const getAmount = (
+  amount: string,
+  decimals: string,
+  options?: FormatOptions,
+) => {
+  if (!amount || !decimals) {
+    return '';
+  }
+
+  const numericAmount = calcTokenAmount(
+    amount,
+    parseFloat(decimals),
+  ).toNumber();
+
+  return formatAmount(numericAmount, options);
+};
diff --git a/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.test.ts b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.test.ts
new file mode 100644
index 000000000000..75f65d822467
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.test.ts
@@ -0,0 +1,150 @@
+import {
+  createMockNotificationERC1155Received,
+  createMockNotificationERC1155Sent,
+  createMockNotificationERC20Received,
+  createMockNotificationERC20Sent,
+  createMockNotificationERC721Received,
+  createMockNotificationERC721Sent,
+  createMockNotificationEthReceived,
+  createMockNotificationEthSent,
+  createMockNotificationLidoReadyToBeWithdrawn,
+  createMockNotificationLidoStakeCompleted,
+  createMockNotificationLidoWithdrawalCompleted,
+  createMockNotificationLidoWithdrawalRequested,
+  createMockNotificationMetaMaskSwapsCompleted,
+  createMockNotificationRocketPoolStakeCompleted,
+  createMockNotificationRocketPoolUnStakeCompleted,
+} from '../../metamask-notifications/mocks/mock-raw-notifications';
+import { createNotificationMessage } from './get-notification-message';
+
+describe('notification-message tests', () => {
+  test('displays erc20 sent notification', () => {
+    const notification = createMockNotificationERC20Sent();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Funds sent');
+    expect(result?.description).toContain('You successfully sent 4.96K USDC');
+  });
+
+  test('displays erc20 received notification', () => {
+    const notification = createMockNotificationERC20Received();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Funds received');
+    expect(result?.description).toContain('You received 8.38B SHIB');
+  });
+
+  test('displays eth/native sent notification', () => {
+    const notification = createMockNotificationEthSent();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Funds sent');
+    expect(result?.description).toContain('You successfully sent 0.005 ETH');
+  });
+
+  test('displays eth/native received notification', () => {
+    const notification = createMockNotificationEthReceived();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Funds received');
+    expect(result?.description).toContain('You received 808 ETH');
+  });
+
+  test('displays metamask swap completed notification', () => {
+    const notification = createMockNotificationMetaMaskSwapsCompleted();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Swap completed');
+    expect(result?.description).toContain('Your MetaMask Swap was successful');
+  });
+
+  test('displays erc721 sent notification', () => {
+    const notification = createMockNotificationERC721Sent();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('NFT sent');
+    expect(result?.description).toContain('You have successfully sent an NFT');
+  });
+
+  test('displays erc721 received notification', () => {
+    const notification = createMockNotificationERC721Received();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('NFT received');
+    expect(result?.description).toContain('You received new NFTs');
+  });
+
+  test('displays erc1155 sent notification', () => {
+    const notification = createMockNotificationERC1155Sent();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('NFT sent');
+    expect(result?.description).toContain('You have successfully sent an NFT');
+  });
+
+  test('displays erc1155 received notification', () => {
+    const notification = createMockNotificationERC1155Received();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('NFT received');
+    expect(result?.description).toContain('You received new NFTs');
+  });
+
+  test('displays rocketpool stake completed notification', () => {
+    const notification = createMockNotificationRocketPoolStakeCompleted();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Stake complete');
+    expect(result?.description).toContain(
+      'Your RocketPool stake was successful',
+    );
+  });
+
+  test('displays rocketpool unstake completed notification', () => {
+    const notification = createMockNotificationRocketPoolUnStakeCompleted();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Unstake complete');
+    expect(result?.description).toContain(
+      'Your RocketPool unstake was successful',
+    );
+  });
+
+  test('displays lido stake completed notification', () => {
+    const notification = createMockNotificationLidoStakeCompleted();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Stake complete');
+    expect(result?.description).toContain('Your Lido stake was successful');
+  });
+
+  test('displays lido stake ready to be withdrawn notification', () => {
+    const notification = createMockNotificationLidoReadyToBeWithdrawn();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Stake ready for withdrawal');
+    expect(result?.description).toContain(
+      'Your Lido stake is now ready to be withdrawn',
+    );
+  });
+
+  test('displays lido withdrawal requested notification', () => {
+    const notification = createMockNotificationLidoWithdrawalRequested();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Withdrawal requested');
+    expect(result?.description).toContain(
+      'Your Lido withdrawal request was submitted',
+    );
+  });
+
+  test('displays lido withdrawal completed notification', () => {
+    const notification = createMockNotificationLidoWithdrawalCompleted();
+    const result = createNotificationMessage(notification);
+
+    expect(result?.title).toBe('Withdrawal completed');
+    expect(result?.description).toContain(
+      'Your Lido withdrawal was successful',
+    );
+  });
+});
diff --git a/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
new file mode 100644
index 000000000000..9fb296b51b4d
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
@@ -0,0 +1,246 @@
+// We are defining that this file uses a webworker global scope.
+// eslint-disable-next-line spaced-comment
+/// <reference lib="webworker" />
+
+import { CHAIN_SYMBOLS } from '../../metamask-notifications/constants/notification-schema';
+import type { TRIGGER_TYPES } from '../../metamask-notifications/constants/notification-schema';
+import type { OnChainRawNotification } from '../../metamask-notifications/types/on-chain-notification/on-chain-notification';
+import { t } from '../../../translate';
+import { getAmount, formatAmount } from './get-notification-data';
+
+type PushNotificationMessage = {
+  title: string;
+  description: string;
+};
+
+type NotificationMessage<
+  N extends OnChainRawNotification = OnChainRawNotification,
+> = {
+  title: string | null;
+  defaultDescription: string | null;
+  getDescription?: (n: N) => string | null;
+};
+
+type NotificationMessageDict = {
+  [K in TRIGGER_TYPES]?: NotificationMessage<
+    Extract<OnChainRawNotification, { data: { kind: `${K}` } }>
+  >;
+};
+
+const sw = self as unknown as ServiceWorkerGlobalScope;
+
+function getChainSymbol(chainId: number) {
+  return CHAIN_SYMBOLS[chainId] ?? null;
+}
+
+export async function onPushNotification(notification: unknown): Promise<void> {
+  if (!notification) {
+    return;
+  }
+  if (!isOnChainNotification(notification)) {
+    return;
+  }
+
+  const notificationMessage = createNotificationMessage(notification);
+  if (!notificationMessage) {
+    return;
+  }
+
+  const registration = sw?.registration;
+  if (!registration) {
+    return;
+  }
+
+  await registration.showNotification(notificationMessage.title, {
+    body: notificationMessage.description,
+    icon: './images/icon-64.png',
+    tag: notification?.id,
+    data: notification,
+  });
+}
+
+function isOnChainNotification(n: unknown): n is OnChainRawNotification {
+  const assumed = n as OnChainRawNotification;
+
+  // We don't have a validation/parsing library to check all possible types of an on chain notification
+  // It is safe enough just to check "some" fields, and catch any errors down the line if the shape is bad.
+  const isValidEnoughToBeOnChainNotification = [
+    assumed?.id,
+    assumed?.data,
+    assumed?.trigger_id,
+  ].every((field) => field !== undefined);
+  return isValidEnoughToBeOnChainNotification;
+}
+
+const notificationMessageDict: NotificationMessageDict = {
+  erc20_sent: {
+    title: t('pushPlatformNotificationsFundsSentTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsFundsSentDescriptionDefault',
+    ),
+    getDescription: (n) => {
+      const symbol = n?.data?.token?.symbol;
+      const tokenAmount = n?.data?.token?.amount;
+      const tokenDecimals = n?.data?.token?.decimals;
+      if (!symbol || !tokenAmount || !tokenDecimals) {
+        return null;
+      }
+
+      const amount = getAmount(tokenAmount, tokenDecimals, {
+        shouldEllipse: true,
+      });
+      return t('pushPlatformNotificationsFundsSentDescription', amount, symbol);
+    },
+  },
+  eth_sent: {
+    title: t('pushPlatformNotificationsFundsSentTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsFundsSentDescriptionDefault',
+    ),
+    getDescription: (n) => {
+      const symbol = getChainSymbol(n?.chain_id);
+      const tokenAmount = n?.data?.amount?.eth;
+      if (!symbol || !tokenAmount) {
+        return null;
+      }
+
+      const amount = formatAmount(parseFloat(tokenAmount), {
+        shouldEllipse: true,
+      });
+      return t('pushPlatformNotificationsFundsSentDescription', amount, symbol);
+    },
+  },
+  erc20_received: {
+    title: t('pushPlatformNotificationsFundsReceivedTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsFundsReceivedDescriptionDefault',
+    ),
+    getDescription: (n) => {
+      const symbol = n?.data?.token?.symbol;
+      const tokenAmount = n?.data?.token?.amount;
+      const tokenDecimals = n?.data?.token?.decimals;
+      if (!symbol || !tokenAmount || !tokenDecimals) {
+        return null;
+      }
+
+      const amount = getAmount(tokenAmount, tokenDecimals, {
+        shouldEllipse: true,
+      });
+      return t(
+        'pushPlatformNotificationsFundsReceivedDescription',
+        amount,
+        symbol,
+      );
+    },
+  },
+  eth_received: {
+    title: t('pushPlatformNotificationsFundsReceivedTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsFundsReceivedDescriptionDefault',
+    ),
+    getDescription: (n) => {
+      const symbol = getChainSymbol(n?.chain_id);
+      const tokenAmount = n?.data?.amount?.eth;
+      if (!symbol || !tokenAmount) {
+        return null;
+      }
+
+      const amount = formatAmount(parseFloat(tokenAmount), {
+        shouldEllipse: true,
+      });
+      return t(
+        'pushPlatformNotificationsFundsReceivedDescription',
+        amount,
+        symbol,
+      );
+    },
+  },
+  metamask_swap_completed: {
+    title: t('pushPlatformNotificationsSwapCompletedTitle'),
+    defaultDescription: t('pushPlatformNotificationsSwapCompletedDescription'),
+  },
+  erc721_sent: {
+    title: t('pushPlatformNotificationsNftSentTitle'),
+    defaultDescription: t('pushPlatformNotificationsNftSentDescription'),
+  },
+  erc1155_sent: {
+    title: t('pushPlatformNotificationsNftSentTitle'),
+    defaultDescription: t('pushPlatformNotificationsNftSentDescription'),
+  },
+  erc721_received: {
+    title: t('pushPlatformNotificationsNftReceivedTitle'),
+    defaultDescription: t('pushPlatformNotificationsNftReceivedDescription'),
+  },
+  erc1155_received: {
+    title: t('pushPlatformNotificationsNftReceivedTitle'),
+    defaultDescription: t('pushPlatformNotificationsNftReceivedDescription'),
+  },
+  rocketpool_stake_completed: {
+    title: t('pushPlatformNotificationsStakingRocketpoolStakeCompletedTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsStakingRocketpoolStakeCompletedDescription',
+    ),
+  },
+  rocketpool_unstake_completed: {
+    title: t('pushPlatformNotificationsStakingRocketpoolUnstakeCompletedTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsStakingRocketpoolUnstakeCompletedDescription',
+    ),
+  },
+  lido_stake_completed: {
+    title: t('pushPlatformNotificationsStakingLidoStakeCompletedTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsStakingLidoStakeCompletedDescription',
+    ),
+  },
+  lido_stake_ready_to_be_withdrawn: {
+    title: t(
+      'pushPlatformNotificationsStakingLidoStakeReadyToBeWithdrawnTitle',
+    ),
+    defaultDescription: t(
+      'pushPlatformNotificationsStakingLidoStakeReadyToBeWithdrawnDescription',
+    ),
+  },
+  lido_withdrawal_requested: {
+    title: t('pushPlatformNotificationsStakingLidoWithdrawalRequestedTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsStakingLidoWithdrawalRequestedDescription',
+    ),
+  },
+  lido_withdrawal_completed: {
+    title: t('pushPlatformNotificationsStakingLidoWithdrawalCompletedTitle'),
+    defaultDescription: t(
+      'pushPlatformNotificationsStakingLidoWithdrawalCompletedDescription',
+    ),
+  },
+};
+
+export function createNotificationMessage(
+  n: OnChainRawNotification,
+): PushNotificationMessage | null {
+  if (!n?.data?.kind) {
+    return null;
+  }
+  const notificationMessage = notificationMessageDict[n.data.kind] as
+    | NotificationMessage
+    | undefined;
+
+  if (!notificationMessage) {
+    return null;
+  }
+
+  let description: string | null = null;
+  try {
+    description =
+      notificationMessage?.getDescription?.(n) ??
+      notificationMessage.defaultDescription ??
+      null;
+  } catch (e) {
+    description = notificationMessage.defaultDescription ?? null;
+  }
+
+  return {
+    title: notificationMessage.title ?? '', // Ensure title is always a string
+    description: description ?? '', // Fallback to empty string if null
+  };
+}
diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
index 165faed699e0..38c9fb761ca6 100644
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@@ -43,7 +43,6 @@ import {
   calcGasTotal,
   calcTokenAmount,
 } from '../../../shared/lib/transactions-controller-utils';
-import fetchEstimatedL1Fee from '../../../ui/helpers/utils/optimism/fetchEstimatedL1Fee';
 
 import { Numeric } from '../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../shared/constants/common';
@@ -118,6 +117,7 @@ export default class SwapsController {
       getTokenRatesState,
       fetchTradesInfo = defaultFetchTradesInfo,
       getCurrentChainId,
+      getLayer1GasFee,
       getEIP1559GasFeeEstimates,
       trackMetaMetricsEvent,
     },
@@ -143,6 +143,8 @@ export default class SwapsController {
     this._getCurrentChainId = getCurrentChainId;
     this._getEIP1559GasFeeEstimates = getEIP1559GasFeeEstimates;
 
+    this._getLayer1GasFee = getLayer1GasFee;
+
     this.getBufferedGasLimit = getBufferedGasLimit;
     this.getTokenRatesState = getTokenRatesState;
     this.trackMetaMetricsEvent = trackMetaMetricsEvent;
@@ -321,14 +323,11 @@ export default class SwapsController {
       await Promise.all(
         Object.values(newQuotes).map(async (quote) => {
           if (quote.trade) {
-            const multiLayerL1TradeFeeTotal = await fetchEstimatedL1Fee(
+            const multiLayerL1TradeFeeTotal = await this._getLayer1GasFee({
+              transactionParams: quote.trade,
               chainId,
-              {
-                txParams: quote.trade,
-                chainId,
-              },
-              this.ethersProvider,
-            );
+            });
+
             quote.multiLayerL1TradeFeeTotal = multiLayerL1TradeFeeTotal;
           }
           return quote;
diff --git a/app/scripts/controllers/swaps.test.js b/app/scripts/controllers/swaps.test.js
index a7ebd0aaed74..9494a94abc09 100644
--- a/app/scripts/controllers/swaps.test.js
+++ b/app/scripts/controllers/swaps.test.js
@@ -128,7 +128,11 @@ const EMPTY_INIT_STATE = {
 const sandbox = sinon.createSandbox();
 let fetchTradesInfoStub = sandbox.stub();
 const getCurrentChainIdStub = sandbox.stub();
+const getLayer1GasFeeStub = sandbox.stub();
+const getNetworkClientIdStub = sandbox.stub();
 getCurrentChainIdStub.returns(CHAIN_IDS.MAINNET);
+getNetworkClientIdStub.returns('1');
+getLayer1GasFeeStub.resolves('0x1');
 const getEIP1559GasFeeEstimatesStub = sandbox.stub(() => {
   return {
     gasFeeEstimates: {
@@ -150,6 +154,8 @@ describe('SwapsController', function () {
       fetchTradesInfo: fetchTradesInfoStub,
       getCurrentChainId: getCurrentChainIdStub,
       getEIP1559GasFeeEstimates: getEIP1559GasFeeEstimatesStub,
+      getNetworkClientId: getNetworkClientIdStub,
+      getLayer1GasFee: getLayer1GasFeeStub,
     });
   };
 
@@ -667,9 +673,9 @@ describe('SwapsController', function () {
             total: '5.43388249494949494949494949494949495',
             medianMetaMaskFee: '0.444444444444444444444444444444444444',
           },
-          ethFee: '0.113822',
-          multiLayerL1TradeFeeTotal: '0x0103c18816d4e8',
-          overallValueOfQuote: '49.886178',
+          ethFee: '0.113536',
+          multiLayerL1TradeFeeTotal: '0x1',
+          overallValueOfQuote: '49.886464',
           metaMaskFeeInEth: '0.50505050505050505050505050505050505',
           ethValueOfTokens: '50',
         });
@@ -851,6 +857,8 @@ describe('SwapsController', function () {
           getTokenRatesState: MOCK_TOKEN_RATES_STORE,
           fetchTradesInfo: fetchTradesInfoStub,
           getCurrentChainId: getCurrentChainIdStub,
+          getLayer1GasFee: getLayer1GasFeeStub,
+          getNetworkClientId: getNetworkClientIdStub,
         });
         const firstEthersInstance = _swapsController.ethersProvider;
         const firstEthersProviderChainId =
diff --git a/app/scripts/controllers/user-storage/encryption.test.ts b/app/scripts/controllers/user-storage/encryption.test.ts
new file mode 100644
index 000000000000..31e1aa151367
--- /dev/null
+++ b/app/scripts/controllers/user-storage/encryption.test.ts
@@ -0,0 +1,38 @@
+import encryption, { createSHA256Hash } from './encryption';
+
+describe('encryption tests', () => {
+  const PASSWORD = '123';
+  const DATA1 = 'Hello World';
+  const DATA2 = JSON.stringify({ foo: 'bar' });
+
+  it('Should encrypt and decrypt data', () => {
+    function actEncryptDecrypt(data: string) {
+      const encryptedString = encryption.encryptString(data, PASSWORD);
+      const decryptString = encryption.decryptString(encryptedString, PASSWORD);
+      return decryptString;
+    }
+
+    expect(actEncryptDecrypt(DATA1)).toBe(DATA1);
+
+    expect(actEncryptDecrypt(DATA2)).toBe(DATA2);
+  });
+
+  it('Should decrypt some existing data', () => {
+    const encryptedData = `{"v":"1","d":"R+sCbzS6clo5iLbSzBr889miNfHhCBmOCk2CFwTH55IkbOIL9f5Nm2t0nmWOVtFbjLpnj6cKyw==","iterations":900000}`;
+    const result = encryption.decryptString(encryptedData, PASSWORD);
+    expect(result).toBe(DATA1);
+  });
+
+  it('Should sha-256 hash a value and should be deterministic', () => {
+    const DATA = 'Hello World';
+    const EXPECTED_HASH =
+      'a591a6d40bf420404a011733cfb7b190d62c65bf0bcda32b57b277d9ad9f146e';
+
+    const hash1 = createSHA256Hash(DATA);
+    expect(hash1).toBe(EXPECTED_HASH);
+
+    // Hash should be deterministic (same output with same input)
+    const hash2 = createSHA256Hash(DATA);
+    expect(hash1).toBe(hash2);
+  });
+});
diff --git a/app/scripts/controllers/user-storage/encryption.ts b/app/scripts/controllers/user-storage/encryption.ts
new file mode 100644
index 000000000000..f8081e97587a
--- /dev/null
+++ b/app/scripts/controllers/user-storage/encryption.ts
@@ -0,0 +1,138 @@
+import { pbkdf2 } from '@noble/hashes/pbkdf2';
+import { sha256 } from '@noble/hashes/sha256';
+import { utf8ToBytes, concatBytes, bytesToHex } from '@noble/hashes/utils';
+import { gcm } from '@noble/ciphers/aes';
+import { randomBytes } from '@noble/ciphers/webcrypto';
+
+export type EncryptedPayload = {
+  v: '1'; // version
+  d: string; // data
+  iterations: number;
+};
+
+function byteArrayToBase64(byteArray: Uint8Array) {
+  return Buffer.from(byteArray).toString('base64');
+}
+
+function base64ToByteArray(base64: string) {
+  return new Uint8Array(Buffer.from(base64, 'base64'));
+}
+
+function bytesToUtf8(byteArray: Uint8Array) {
+  const decoder = new TextDecoder('utf-8');
+  return decoder.decode(byteArray);
+}
+
+class EncryptorDecryptor {
+  #ALGORITHM_NONCE_SIZE: number = 12; // 12 bytes
+
+  #ALGORITHM_KEY_SIZE: number = 16; // 16 bytes
+
+  #PBKDF2_SALT_SIZE: number = 16; // 16 bytes
+
+  #PBKDF2_ITERATIONS: number = 900_000;
+
+  encryptString(plaintext: string, password: string): string {
+    try {
+      return this.#encryptStringV1(plaintext, password);
+    } catch (e) {
+      const errorMessage = e instanceof Error ? e.message : e;
+      throw new Error(`Unable to encrypt string - ${errorMessage}`);
+    }
+  }
+
+  decryptString(encryptedDataStr: string, password: string): string {
+    try {
+      const encryptedData: EncryptedPayload = JSON.parse(encryptedDataStr);
+      if (encryptedData.v === '1') {
+        return this.#decryptStringV1(encryptedData, password);
+      }
+      throw new Error(`Unsupported encrypted data payload - ${encryptedData}`);
+    } catch (e) {
+      const errorMessage = e instanceof Error ? e.message : e;
+      throw new Error(`Unable to decrypt string - ${errorMessage}`);
+    }
+  }
+
+  #encryptStringV1(plaintext: string, password: string): string {
+    const salt = randomBytes(this.#PBKDF2_SALT_SIZE);
+
+    // Derive a key using PBKDF2.
+    const key = pbkdf2(sha256, password, salt, {
+      c: this.#PBKDF2_ITERATIONS,
+      dkLen: this.#ALGORITHM_KEY_SIZE,
+    });
+
+    // Encrypt and prepend salt.
+    const plaintextRaw = utf8ToBytes(plaintext);
+    const ciphertextAndNonceAndSalt = concatBytes(
+      salt,
+      this.#encrypt(plaintextRaw, key),
+    );
+
+    // Convert to Base64
+    const encryptedData = byteArrayToBase64(ciphertextAndNonceAndSalt);
+
+    const encryptedPayload: EncryptedPayload = {
+      v: '1',
+      d: encryptedData,
+      iterations: this.#PBKDF2_ITERATIONS,
+    };
+
+    return JSON.stringify(encryptedPayload);
+  }
+
+  #decryptStringV1(data: EncryptedPayload, password: string): string {
+    const { iterations, d: base64CiphertextAndNonceAndSalt } = data;
+
+    // Decode the base64.
+    const ciphertextAndNonceAndSalt = base64ToByteArray(
+      base64CiphertextAndNonceAndSalt,
+    );
+
+    // Create buffers of salt and ciphertextAndNonce.
+    const salt = ciphertextAndNonceAndSalt.slice(0, this.#PBKDF2_SALT_SIZE);
+    const ciphertextAndNonce = ciphertextAndNonceAndSalt.slice(
+      this.#PBKDF2_SALT_SIZE,
+      ciphertextAndNonceAndSalt.length,
+    );
+
+    // Derive the key using PBKDF2.
+    const key = pbkdf2(sha256, password, salt, {
+      c: iterations,
+      dkLen: this.#ALGORITHM_KEY_SIZE,
+    });
+
+    // Decrypt and return result.
+    return bytesToUtf8(this.#decrypt(ciphertextAndNonce, key));
+  }
+
+  #encrypt(plaintext: Uint8Array, key: Uint8Array): Uint8Array {
+    const nonce = randomBytes(this.#ALGORITHM_NONCE_SIZE);
+
+    // Encrypt and prepend nonce.
+    const ciphertext = gcm(key, nonce).encrypt(plaintext);
+
+    return concatBytes(nonce, ciphertext);
+  }
+
+  #decrypt(ciphertextAndNonce: Uint8Array, key: Uint8Array): Uint8Array {
+    // Create buffers of nonce and ciphertext.
+    const nonce = ciphertextAndNonce.slice(0, this.#ALGORITHM_NONCE_SIZE);
+    const ciphertext = ciphertextAndNonce.slice(
+      this.#ALGORITHM_NONCE_SIZE,
+      ciphertextAndNonce.length,
+    );
+
+    // Decrypt and return result.
+    return gcm(key, nonce).decrypt(ciphertext);
+  }
+}
+
+const encryption = new EncryptorDecryptor();
+export default encryption;
+
+export function createSHA256Hash(data: string): string {
+  const hashedData = sha256(data);
+  return bytesToHex(hashedData);
+}
diff --git a/app/scripts/controllers/user-storage/mocks/mockServices.ts b/app/scripts/controllers/user-storage/mocks/mockServices.ts
new file mode 100644
index 000000000000..97ffa703dc9c
--- /dev/null
+++ b/app/scripts/controllers/user-storage/mocks/mockServices.ts
@@ -0,0 +1,40 @@
+import nock from 'nock';
+import { USER_STORAGE_ENDPOINT, GetUserStorageResponse } from '../services';
+import { createEntryPath } from '../schema';
+import { MOCK_ENCRYPTED_STORAGE_DATA, MOCK_STORAGE_KEY } from './mockStorage';
+
+export const MOCK_USER_STORAGE_NOTIFICATIONS_ENDPOINT = `${USER_STORAGE_ENDPOINT}${createEntryPath(
+  'notification_settings',
+  MOCK_STORAGE_KEY,
+)}`;
+
+type MockReply = {
+  status: nock.StatusCode;
+  body?: nock.Body;
+};
+
+const MOCK_GET_USER_STORAGE_RESPONSE: GetUserStorageResponse = {
+  HashedKey: 'HASHED_KEY',
+  Data: MOCK_ENCRYPTED_STORAGE_DATA,
+};
+export function mockEndpointGetUserStorage(mockReply?: MockReply) {
+  const reply = mockReply ?? {
+    status: 200,
+    body: MOCK_GET_USER_STORAGE_RESPONSE,
+  };
+
+  const mockEndpoint = nock(MOCK_USER_STORAGE_NOTIFICATIONS_ENDPOINT)
+    .get('')
+    .reply(reply.status, reply.body);
+
+  return mockEndpoint;
+}
+
+export function mockEndpointUpsertUserStorage(
+  mockReply?: Pick<MockReply, 'status'>,
+) {
+  const mockEndpoint = nock(MOCK_USER_STORAGE_NOTIFICATIONS_ENDPOINT)
+    .put('')
+    .reply(mockReply?.status ?? 204);
+  return mockEndpoint;
+}
diff --git a/app/scripts/controllers/user-storage/mocks/mockStorage.ts b/app/scripts/controllers/user-storage/mocks/mockStorage.ts
new file mode 100644
index 000000000000..4a43a80556e1
--- /dev/null
+++ b/app/scripts/controllers/user-storage/mocks/mockStorage.ts
@@ -0,0 +1,9 @@
+import encryption, { createSHA256Hash } from '../encryption';
+
+export const MOCK_STORAGE_KEY_SIGNATURE = 'mockStorageKey';
+export const MOCK_STORAGE_KEY = createSHA256Hash(MOCK_STORAGE_KEY_SIGNATURE);
+export const MOCK_STORAGE_DATA = JSON.stringify({ hello: 'world' });
+export const MOCK_ENCRYPTED_STORAGE_DATA = encryption.encryptString(
+  MOCK_STORAGE_DATA,
+  MOCK_STORAGE_KEY,
+);
diff --git a/app/scripts/controllers/user-storage/schema.test.ts b/app/scripts/controllers/user-storage/schema.test.ts
new file mode 100644
index 000000000000..d08b0802bf49
--- /dev/null
+++ b/app/scripts/controllers/user-storage/schema.test.ts
@@ -0,0 +1,21 @@
+import { USER_STORAGE_ENTRIES, createEntryPath } from './schema';
+
+describe('schema.ts - createEntryPath()', () => {
+  const MOCK_STORAGE_KEY = 'MOCK_STORAGE_KEY';
+
+  test('creates a valid entry path', () => {
+    const result = createEntryPath('notification_settings', MOCK_STORAGE_KEY);
+
+    // Ensures that the path and the entry name are correct.
+    // If this differs then indicates a potential change on how this path is computed
+    const expected = `/${USER_STORAGE_ENTRIES.notification_settings.path}/50f65447980018849b991e038d7ad87de5cf07fbad9736b0280e93972e17bac8`;
+    expect(result).toBe(expected);
+  });
+
+  test('Should throw if using an entry that does not exist', () => {
+    expect(() => {
+      // @ts-expect-error mocking a fake entry for testing.
+      createEntryPath('fake_entry');
+    }).toThrow();
+  });
+});
diff --git a/app/scripts/controllers/user-storage/schema.ts b/app/scripts/controllers/user-storage/schema.ts
new file mode 100644
index 000000000000..19bc0ccfae52
--- /dev/null
+++ b/app/scripts/controllers/user-storage/schema.ts
@@ -0,0 +1,38 @@
+import { createSHA256Hash } from './encryption';
+
+type UserStorageEntry = { path: string; entryName: string };
+
+/**
+ * The User Storage Endpoint requires a path and an entry name.
+ * Developers can provide additional paths by extending this variable below
+ */
+export const USER_STORAGE_ENTRIES = {
+  notification_settings: {
+    path: 'notifications',
+    entryName: 'notification_settings',
+  },
+} satisfies Record<string, UserStorageEntry>;
+
+export type UserStorageEntryKeys = keyof typeof USER_STORAGE_ENTRIES;
+
+/**
+ * Constructs a unique entry path for a user.
+ * This can be done due to the uniqueness of the storage key (no users will share the same storage key).
+ * The users entry is a unique hash that cannot be reversed.
+ *
+ * @param entryKey
+ * @param storageKey
+ * @returns
+ */
+export function createEntryPath(
+  entryKey: UserStorageEntryKeys,
+  storageKey: string,
+): string {
+  const entry = USER_STORAGE_ENTRIES[entryKey];
+  if (!entry) {
+    throw new Error(`user-storage - invalid entry provided: ${entryKey}`);
+  }
+
+  const hashedKey = createSHA256Hash(entry.entryName + storageKey);
+  return `/${entry.path}/${hashedKey}`;
+}
diff --git a/app/scripts/controllers/user-storage/services.test.ts b/app/scripts/controllers/user-storage/services.test.ts
new file mode 100644
index 000000000000..a746dcee858f
--- /dev/null
+++ b/app/scripts/controllers/user-storage/services.test.ts
@@ -0,0 +1,89 @@
+import {
+  mockEndpointGetUserStorage,
+  mockEndpointUpsertUserStorage,
+} from './mocks/mockServices';
+import {
+  MOCK_ENCRYPTED_STORAGE_DATA,
+  MOCK_STORAGE_DATA,
+  MOCK_STORAGE_KEY,
+} from './mocks/mockStorage';
+import {
+  GetUserStorageResponse,
+  getUserStorage,
+  upsertUserStorage,
+} from './services';
+
+describe('user-storage/services.ts - getUserStorage() tests', () => {
+  test('returns user storage data', async () => {
+    const mockGetUserStorage = mockEndpointGetUserStorage();
+    const result = await actCallGetUserStorage();
+
+    mockGetUserStorage.done();
+    expect(result).toBe(MOCK_STORAGE_DATA);
+  });
+
+  test('returns null if endpoint does not have entry', async () => {
+    const mockGetUserStorage = mockEndpointGetUserStorage({ status: 404 });
+    const result = await actCallGetUserStorage();
+
+    mockGetUserStorage.done();
+    expect(result).toBe(null);
+  });
+
+  test('returns null if endpoint fails', async () => {
+    const mockGetUserStorage = mockEndpointGetUserStorage({ status: 500 });
+    const result = await actCallGetUserStorage();
+
+    mockGetUserStorage.done();
+    expect(result).toBe(null);
+  });
+
+  test('returns null if unable to decrypt data', async () => {
+    const badResponseData: GetUserStorageResponse = {
+      HashedKey: 'MOCK_HASH',
+      Data: 'Bad Encrypted Data',
+    };
+    const mockGetUserStorage = mockEndpointGetUserStorage({
+      status: 200,
+      body: badResponseData,
+    });
+    const result = await actCallGetUserStorage();
+
+    mockGetUserStorage.done();
+    expect(result).toBe(null);
+  });
+
+  function actCallGetUserStorage() {
+    return getUserStorage({
+      bearerToken: 'MOCK_BEARER_TOKEN',
+      entryKey: 'notification_settings',
+      storageKey: MOCK_STORAGE_KEY,
+    });
+  }
+});
+
+describe('user-storage/services.ts - upsertUserStorage() tests', () => {
+  test('invokes upsert endpoint with no errors', async () => {
+    const mockUpsertUserStorage = mockEndpointUpsertUserStorage();
+    await actCallUpsertUserStorage();
+
+    expect(mockUpsertUserStorage.isDone()).toBe(true);
+  });
+
+  test('throws error if unable to upsert user storage', async () => {
+    const mockUpsertUserStorage = mockEndpointUpsertUserStorage({
+      status: 500,
+    });
+
+    await expect(actCallUpsertUserStorage()).rejects.toThrow();
+    mockUpsertUserStorage.done();
+  });
+
+  function actCallUpsertUserStorage() {
+    return upsertUserStorage(MOCK_ENCRYPTED_STORAGE_DATA, {
+      bearerToken: 'MOCK_BEARER_TOKEN',
+      entryKey: 'notification_settings',
+      storageKey: MOCK_STORAGE_KEY,
+    });
+  }
+});
diff --git a/app/scripts/controllers/user-storage/services.ts b/app/scripts/controllers/user-storage/services.ts
new file mode 100644
index 000000000000..269009850079
--- /dev/null
+++ b/app/scripts/controllers/user-storage/services.ts
@@ -0,0 +1,83 @@
+import log from 'loglevel';
+
+import encryption from './encryption';
+import { UserStorageEntryKeys, createEntryPath } from './schema';
+
+export const USER_STORAGE_API = process.env.USER_STORAGE_API || '';
+export const USER_STORAGE_ENDPOINT = `${USER_STORAGE_API}/api/v1/userstorage`;
+
+export type GetUserStorageResponse = {
+  HashedKey: string;
+  Data: string;
+};
+
+export type UserStorageOptions = {
+  bearerToken: string;
+  entryKey: UserStorageEntryKeys;
+  storageKey: string;
+};
+
+export async function getUserStorage(
+  opts: UserStorageOptions,
+): Promise<string | null> {
+  try {
+    const path = createEntryPath(opts.entryKey, opts.storageKey);
+    const url = new URL(`${USER_STORAGE_ENDPOINT}${path}`);
+
+    const userStorageResponse = await fetch(url.toString(), {
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${opts.bearerToken}`,
+      },
+    });
+
+    // Acceptable error - since indicates entry does not exist.
+    if (userStorageResponse.status === 404) {
+      return null;
+    }
+
+    if (userStorageResponse.status !== 200) {
+      throw new Error('Unable to get User Storage');
+    }
+
+    const userStorage: GetUserStorageResponse | null =
+      await userStorageResponse.json();
+    const encryptedData = userStorage?.Data ?? null;
+
+    if (!encryptedData) {
+      return null;
+    }
+
+    const decryptedData = encryption.decryptString(
+      encryptedData,
+      opts.storageKey,
+    );
+
+    return decryptedData;
+  } catch (e) {
+    log.error('Failed to get user storage', e);
+    return null;
+  }
+}
+
+export async function upsertUserStorage(
+  data: string,
+  opts: UserStorageOptions,
+): Promise<void> {
+  const encryptedData = encryption.encryptString(data, opts.storageKey);
+  const path = createEntryPath(opts.entryKey, opts.storageKey);
+  const url = new URL(`${USER_STORAGE_ENDPOINT}${path}`);
+
+  const res = await fetch(url.toString(), {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${opts.bearerToken}`,
+    },
+    body: JSON.stringify({ data: encryptedData }),
+  });
+
+  if (!res.ok) {
+    throw new Error('user-storage - unable to upsert data');
+  }
+}
diff --git a/app/scripts/controllers/user-storage/user-storage-controller.test.ts b/app/scripts/controllers/user-storage/user-storage-controller.test.ts
new file mode 100644
index 000000000000..efb0cd4f4ef7
--- /dev/null
+++ b/app/scripts/controllers/user-storage/user-storage-controller.test.ts
@@ -0,0 +1,333 @@
+import nock from 'nock';
+import { ControllerMessenger } from '@metamask/base-controller';
+import {
+  AuthenticationControllerGetBearerToken,
+  AuthenticationControllerGetSessionProfile,
+  AuthenticationControllerIsSignedIn,
+  AuthenticationControllerPerformSignIn,
+} from '../authentication/authentication-controller';
+import {
+  MOCK_STORAGE_DATA,
+  MOCK_STORAGE_KEY,
+  MOCK_STORAGE_KEY_SIGNATURE,
+} from './mocks/mockStorage';
+import UserStorageController, {
+  AllowedActions,
+} from './user-storage-controller';
+import {
+  mockEndpointGetUserStorage,
+  mockEndpointUpsertUserStorage,
+} from './mocks/mockServices';
+
+const typedMockFn = <Fn extends (...args: unknown[]) => unknown>() =>
+  jest.fn<ReturnType<Fn>, Parameters<Fn>>();
+
+describe('user-storage/user-storage-controller - constructor() tests', () => {
+  test('Creates UserStorage with default state', () => {
+    const { messengerMocks } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+
+    expect(controller.state.isProfileSyncingEnabled).toBe(true);
+  });
+
+  function arrangeMocks() {
+    return {
+      messengerMocks: mockUserStorageMessenger(),
+    };
+  }
+});
+
+describe('user-storage/user-storage-controller - performGetStorage() tests', () => {
+  test('returns users notification storage', async () => {
+    const { messengerMocks, mockAPI } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+
+    const result = await controller.performGetStorage('notification_settings');
+    mockAPI.done();
+    expect(result).toBe(MOCK_STORAGE_DATA);
+  });
+
+  test('rejects if UserStorage is not enabled', async () => {
+    const { messengerMocks } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+      state: { isProfileSyncingEnabled: false },
+    });
+
+    await expect(
+      controller.performGetStorage('notification_settings'),
+    ).rejects.toThrow();
+  });
+
+  test.each([
+    [
+      'fails when no bearer token is found (auth errors)',
+      (messengerMocks: ReturnType<typeof mockUserStorageMessenger>) =>
+        messengerMocks.mockAuthGetBearerToken.mockRejectedValue(
+          new Error('MOCK FAILURE'),
+        ),
+    ],
+    [
+      'fails when no session identifier is found (auth errors)',
+      (messengerMocks: ReturnType<typeof mockUserStorageMessenger>) =>
+        messengerMocks.mockAuthGetSessionProfile.mockRejectedValue(
+          new Error('MOCK FAILURE'),
+        ),
+    ],
+  ])('rejects on auth failure - %s', async (_, arrangeFailureCase) => {
+    const { messengerMocks } = arrangeMocks();
+    arrangeFailureCase(messengerMocks);
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+
+    await expect(
+      controller.performGetStorage('notification_settings'),
+    ).rejects.toThrow();
+  });
+
+  function arrangeMocks() {
+    return {
+      messengerMocks: mockUserStorageMessenger(),
+      mockAPI: mockEndpointGetUserStorage(),
+    };
+  }
+});
+
+describe('user-storage/user-storage-controller - performSetStorage() tests', () => {
+  test('saves users storage', async () => {
+    const { messengerMocks, mockAPI } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+
+    await controller.performSetStorage('notification_settings', 'new data');
+    mockAPI.done();
+  });
+
+  test('rejects if UserStorage is not enabled', async () => {
+    const { messengerMocks } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+      state: { isProfileSyncingEnabled: false },
+    });
+
+    await expect(
+      controller.performSetStorage('notification_settings', 'new data'),
+    ).rejects.toThrow();
+  });
+
+  test.each([
+    [
+      'fails when no bearer token is found (auth errors)',
+      (messengerMocks: ReturnType<typeof mockUserStorageMessenger>) =>
+        messengerMocks.mockAuthGetBearerToken.mockRejectedValue(
+          new Error('MOCK FAILURE'),
+        ),
+    ],
+    [
+      'fails when no session identifier is found (auth errors)',
+      (messengerMocks: ReturnType<typeof mockUserStorageMessenger>) =>
+        messengerMocks.mockAuthGetSessionProfile.mockRejectedValue(
+          new Error('MOCK FAILURE'),
+        ),
+    ],
+  ])('rejects on auth failure - %s', async (_, arrangeFailureCase) => {
+    const { messengerMocks } = arrangeMocks();
+    arrangeFailureCase(messengerMocks);
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+
+    await expect(
+      controller.performSetStorage('notification_settings', 'new data'),
+    ).rejects.toThrow();
+  });
+
+  test('rejects if api call fails', async () => {
+    const { messengerMocks } = arrangeMocks({
+      mockAPI: mockEndpointUpsertUserStorage({ status: 500 }),
+    });
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+    await expect(
+      controller.performSetStorage('notification_settings', 'new data'),
+    ).rejects.toThrow();
+  });
+
+  function arrangeMocks(overrides?: { mockAPI?: nock.Scope }) {
+    return {
+      messengerMocks: mockUserStorageMessenger(),
+      mockAPI: overrides?.mockAPI ?? mockEndpointUpsertUserStorage(),
+    };
+  }
+});
+
+describe('user-storage/user-storage-controller - performSetStorage() tests', () => {
+  test('Should return a storage key', async () => {
+    const { messengerMocks } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+
+    const result = await controller.getStorageKey();
+    expect(result).toBe(MOCK_STORAGE_KEY);
+  });
+
+  test('rejects if UserStorage is not enabled', async () => {
+    const { messengerMocks } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+      state: { isProfileSyncingEnabled: false },
+    });
+
+    await expect(controller.getStorageKey()).rejects.toThrow();
+  });
+
+  function arrangeMocks() {
+    return {
+      messengerMocks: mockUserStorageMessenger(),
+    };
+  }
+});
+
+describe('user-storage/user-storage-controller - disableProfileSyncing() tests', () => {
+  test('should disable user storage / profile syncing when called', async () => {
+    const { messengerMocks } = arrangeMocks();
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+    });
+
+    expect(controller.state.isProfileSyncingEnabled).toBe(true);
+    await controller.disableProfileSyncing();
+    expect(controller.state.isProfileSyncingEnabled).toBe(false);
+  });
+
+  function arrangeMocks() {
+    return {
+      messengerMocks: mockUserStorageMessenger(),
+    };
+  }
+});
+
+describe('user-storage/user-storage-controller - enableProfileSyncing() tests', () => {
+  test('should enable user storage / profile syncing', async () => {
+    const { messengerMocks } = arrangeMocks();
+    messengerMocks.mockAuthIsSignedIn.mockReturnValue(false); // mock that auth is not enabled
+
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+      state: { isProfileSyncingEnabled: false },
+    });
+
+    expect(controller.state.isProfileSyncingEnabled).toBe(false);
+    await controller.enableProfileSyncing();
+    expect(controller.state.isProfileSyncingEnabled).toBe(true);
+    expect(messengerMocks.mockAuthIsSignedIn).toBeCalled();
+    expect(messengerMocks.mockAuthPerformSignIn).toBeCalled();
+  });
+
+  function arrangeMocks() {
+    return {
+      messengerMocks: mockUserStorageMessenger(),
+    };
+  }
+});
+
+function mockUserStorageMessenger() {
+  const messenger = new ControllerMessenger<
+    AllowedActions,
+    never
+  >().getRestricted({
+    name: 'UserStorageController',
+    allowedActions: [
+      'SnapController:handleRequest',
+      'AuthenticationController:getBearerToken',
+      'AuthenticationController:getSessionProfile',
+      'AuthenticationController:isSignedIn',
+      'AuthenticationController:performSignIn',
+    ],
+  });
+
+  const mockSnapGetPublicKey = jest.fn().mockResolvedValue('MOCK_PUBLIC_KEY');
+  const mockSnapSignMessage = jest
+    .fn()
+    .mockResolvedValue(MOCK_STORAGE_KEY_SIGNATURE);
+
+  const mockAuthGetBearerToken =
+    typedMockFn<
+      AuthenticationControllerGetBearerToken['handler']
+    >().mockResolvedValue('MOCK_BEARER_TOKEN');
+
+  const mockAuthGetSessionProfile = typedMockFn<
+    AuthenticationControllerGetSessionProfile['handler']
+  >().mockResolvedValue({
+    identifierId: '',
+    metametricsId: '',
+    profileId: 'MOCK_PROFILE_ID',
+  });
+
+  const mockAuthPerformSignIn =
+    typedMockFn<
+      AuthenticationControllerPerformSignIn['handler']
+    >().mockResolvedValue('New Access Token');
+
+  const mockAuthIsSignedIn =
+    typedMockFn<
+      AuthenticationControllerIsSignedIn['handler']
+    >().mockReturnValue(true);
+
+  jest.spyOn(messenger, 'call').mockImplementation((...args) => {
+    const [actionType, params] = args;
+    if (actionType === 'SnapController:handleRequest') {
+      if (params?.request.method === 'getPublicKey') {
+        return mockSnapGetPublicKey();
+      }
+
+      if (params?.request.method === 'signMessage') {
+        return mockSnapSignMessage();
+      }
+
+      throw new Error(
+        `MOCK_FAIL - unsupported SnapController:handleRequest call: ${params?.request.method}`,
+      );
+    }
+
+    if (actionType === 'AuthenticationController:getBearerToken') {
+      return mockAuthGetBearerToken();
+    }
+
+    if (actionType === 'AuthenticationController:getSessionProfile') {
+      return mockAuthGetSessionProfile();
+    }
+
+    if (actionType === 'AuthenticationController:performSignIn') {
+      return mockAuthPerformSignIn();
+    }
+
+    if (actionType === 'AuthenticationController:isSignedIn') {
+      return mockAuthIsSignedIn();
+    }
+
+    function exhaustedMessengerMocks(action: never) {
+      throw new Error(`MOCK_FAIL - unsupported messenger call: ${action}`);
+    }
+
+    return exhaustedMessengerMocks(actionType);
+  });
+
+  return {
+    messenger,
+    mockSnapGetPublicKey,
+    mockSnapSignMessage,
+    mockAuthGetBearerToken,
+    mockAuthGetSessionProfile,
+    mockAuthPerformSignIn,
+    mockAuthIsSignedIn,
+  };
+}
diff --git a/app/scripts/controllers/user-storage/user-storage-controller.ts b/app/scripts/controllers/user-storage/user-storage-controller.ts
new file mode 100644
index 000000000000..bb2c66cfd222
--- /dev/null
+++ b/app/scripts/controllers/user-storage/user-storage-controller.ts
@@ -0,0 +1,303 @@
+import {
+  BaseController,
+  RestrictedControllerMessenger,
+  StateMetadata,
+} from '@metamask/base-controller';
+import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import {
+  AuthenticationControllerGetBearerToken,
+  AuthenticationControllerGetSessionProfile,
+  AuthenticationControllerIsSignedIn,
+  AuthenticationControllerPerformSignIn,
+} from '../authentication/authentication-controller';
+import { createSnapSignMessageRequest } from '../authentication/auth-snap-requests';
+import { getUserStorage, upsertUserStorage } from './services';
+import { UserStorageEntryKeys } from './schema';
+import { createSHA256Hash } from './encryption';
+
+const controllerName = 'UserStorageController';
+
+// State
+export type UserStorageControllerState = {
+  /**
+   * Condition used by UI and to determine if we can use some of the User Storage methods.
+   */
+  isProfileSyncingEnabled: boolean;
+};
+const defaultState: UserStorageControllerState = {
+  isProfileSyncingEnabled: true,
+};
+const metadata: StateMetadata<UserStorageControllerState> = {
+  isProfileSyncingEnabled: {
+    persist: true,
+    anonymous: true,
+  },
+};
+
+// Messenger Actions
+type CreateActionsObj<T extends keyof UserStorageController> = {
+  [K in T]: {
+    type: `${typeof controllerName}:${K}`;
+    handler: UserStorageController[K];
+  };
+};
+type ActionsObj = CreateActionsObj<
+  | 'performGetStorage'
+  | 'performSetStorage'
+  | 'getStorageKey'
+  | 'enableProfileSyncing'
+  | 'disableProfileSyncing'
+>;
+export type Actions = ActionsObj[keyof ActionsObj];
+export type UserStorageControllerPerformGetStorage =
+  ActionsObj['performGetStorage'];
+export type UserStorageControllerPerformSetStorage =
+  ActionsObj['performSetStorage'];
+export type UserStorageControllerGetStorageKey = ActionsObj['getStorageKey'];
+export type UserStorageControllerEnableProfileSyncing =
+  ActionsObj['enableProfileSyncing'];
+export type UserStorageControllerDisableProfileSyncing =
+  ActionsObj['disableProfileSyncing'];
+
+// Allowed Actions
+export type AllowedActions =
+  // Snap Requests
+  | HandleSnapRequest
+  // Auth Requests
+  | AuthenticationControllerGetBearerToken
+  | AuthenticationControllerGetSessionProfile
+  | AuthenticationControllerPerformSignIn
+  | AuthenticationControllerIsSignedIn;
+
+// Messenger
+export type UserStorageControllerMessenger = RestrictedControllerMessenger<
+  typeof controllerName,
+  Actions | AllowedActions,
+  never,
+  AllowedActions['type'],
+  never
+>;
+
+/**
+ * Reusable controller that allows any team to store synchronized data for a given user.
+ * These can be settings shared cross MetaMask clients, or data we want to persist when uninstalling/reinstalling.
+ *
+ * NOTE:
+ * - data stored on UserStorage is FULLY encrypted, with the only keys stored/managed on the client.
+ * - No one can access this data unless they are have the SRP and are able to run the signing snap.
+ */
+export default class UserStorageController extends BaseController<
+  typeof controllerName,
+  UserStorageControllerState,
+  UserStorageControllerMessenger
+> {
+  #auth = {
+    getBearerToken: async () => {
+      return await this.messagingSystem.call(
+        'AuthenticationController:getBearerToken',
+      );
+    },
+    getProfileId: async () => {
+      const sessionProfile = await this.messagingSystem.call(
+        'AuthenticationController:getSessionProfile',
+      );
+      return sessionProfile?.profileId;
+    },
+    isAuthEnabled: () => {
+      return this.messagingSystem.call('AuthenticationController:isSignedIn');
+    },
+    signIn: async () => {
+      return await this.messagingSystem.call(
+        'AuthenticationController:performSignIn',
+      );
+    },
+  };
+
+  constructor(params: {
+    messenger: UserStorageControllerMessenger;
+    state?: UserStorageControllerState;
+  }) {
+    super({
+      messenger: params.messenger,
+      metadata,
+      name: controllerName,
+      state: { ...defaultState, ...params.state },
+    });
+
+    this.#registerMessageHandlers();
+  }
+
+  /**
+   * Constructor helper for registering this controller's messaging system
+   * actions.
+   */
+  #registerMessageHandlers(): void {
+    this.messagingSystem.registerActionHandler(
+      'UserStorageController:performGetStorage',
+      this.performGetStorage.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'UserStorageController:performSetStorage',
+      this.performSetStorage.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'UserStorageController:getStorageKey',
+      this.getStorageKey.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'UserStorageController:enableProfileSyncing',
+      this.enableProfileSyncing.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      'UserStorageController:disableProfileSyncing',
+      this.disableProfileSyncing.bind(this),
+    );
+  }
+
+  public async enableProfileSyncing(): Promise<void> {
+    const isAlreadyEnabled = this.state.isProfileSyncingEnabled;
+    if (isAlreadyEnabled) {
+      return;
+    }
+
+    try {
+      const authEnabled = this.#auth.isAuthEnabled();
+      if (!authEnabled) {
+        await this.#auth.signIn();
+      }
+
+      this.update((state) => {
+        state.isProfileSyncingEnabled = true;
+      });
+    } catch (e) {
+      const errorMessage = e instanceof Error ? e.message : e;
+      throw new Error(
+        `${controllerName} - failed to enable profile syncing - ${errorMessage}`,
+      );
+    }
+  }
+
+  public async disableProfileSyncing(): Promise<void> {
+    const isAlreadyDisabled = !this.state.isProfileSyncingEnabled;
+    if (isAlreadyDisabled) {
+      return;
+    }
+
+    this.update((state) => {
+      state.isProfileSyncingEnabled = false;
+    });
+  }
+
+  /**
+   * Allows retrieval of stored data. Data stored is string formatted.
+   * Developers can extend the entry path and entry name through the `schema.ts` file.
+   *
+   * @param entryKey
+   * @returns the decrypted string contents found from user storage (or null if not found)
+   */
+  public async performGetStorage(
+    entryKey: UserStorageEntryKeys,
+  ): Promise<string | null> {
+    this.#assertProfileSyncingEnabled();
+    const { bearerToken, storageKey } =
+      await this.#getStorageKeyAndBearerToken();
+    const result = await getUserStorage({
+      entryKey,
+      bearerToken,
+      storageKey,
+    });
+
+    return result;
+  }
+
+  /**
+   * Allows storage of user data. Data stored must be string formatted.
+   * Developers can extend the entry path and entry name through the `schema.ts` file.
+   *
+   * @param entryKey
+   * @param value - The string data you want to store.
+   * @returns nothing. NOTE that an error is thrown if fails to store data.
+   */
+  public async performSetStorage(
+    entryKey: UserStorageEntryKeys,
+    value: string,
+  ): Promise<void> {
+    this.#assertProfileSyncingEnabled();
+    const { bearerToken, storageKey } =
+      await this.#getStorageKeyAndBearerToken();
+
+    await upsertUserStorage(value, {
+      entryKey,
+      bearerToken,
+      storageKey,
+    });
+  }
+
+  /**
+   * Retrieves the storage key, for internal use only!
+   *
+   * @returns the storage key
+   */
+  public async getStorageKey(): Promise<string> {
+    this.#assertProfileSyncingEnabled();
+    const storageKey = await this.#createStorageKey();
+    return storageKey;
+  }
+
+  #assertProfileSyncingEnabled(): void {
+    if (!this.state.isProfileSyncingEnabled) {
+      throw new Error(
+        `${controllerName}: Unable to call method, user is not authenticated`,
+      );
+    }
+  }
+
+  /**
+   * Utility to get the bearer token and storage key
+   */
+  async #getStorageKeyAndBearerToken(): Promise<{
+    bearerToken: string;
+    storageKey: string;
+  }> {
+    const bearerToken = await this.#auth.getBearerToken();
+    if (!bearerToken) {
+      throw new Error('UserStorageController - unable to get bearer token');
+    }
+    const storageKey = await this.#createStorageKey();
+
+    return { bearerToken, storageKey };
+  }
+
+  /**
+   * Rather than storing the storage key, we can compute the storage key when needed.
+   *
+   * @returns the storage key
+   */
+  async #createStorageKey(): Promise<string> {
+    const id = await this.#auth.getProfileId();
+    if (!id) {
+      throw new Error('UserStorageController - unable to create storage key');
+    }
+
+    const storageKeySignature = await this.#snapSignMessage(`metamask:${id}`);
+    const storageKey = createSHA256Hash(storageKeySignature);
+    return storageKey;
+  }
+
+  /**
+   * Signs a specific message using an underlying auth snap.
+   *
+   * @param message - A specific tagged message to sign.
+   * @returns A Signature created by the snap.
+   */
+  #snapSignMessage(message: `metamask:${string}`): Promise<string> {
+    return this.messagingSystem.call(
+      'SnapController:handleRequest',
+      createSnapSignMessageRequest(message),
+    ) as Promise<string>;
+  }
+}
diff --git a/app/scripts/lib/AbstractPetnamesBridge.test.ts b/app/scripts/lib/AbstractPetnamesBridge.test.ts
index 608454b38afe..3347c90f13f5 100644
--- a/app/scripts/lib/AbstractPetnamesBridge.test.ts
+++ b/app/scripts/lib/AbstractPetnamesBridge.test.ts
@@ -94,6 +94,8 @@ function createNameControllerMock(state: NameControllerState) {
 function createMessengerMock(): jest.Mocked<PetnamesBridgeMessenger> {
   return {
     subscribe: jest.fn(),
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any;
 }
 
diff --git a/app/scripts/lib/AccountIdentitiesPetnamesBridge.test.ts b/app/scripts/lib/AccountIdentitiesPetnamesBridge.test.ts
index 6431381d7099..b7ac979f3a1c 100644
--- a/app/scripts/lib/AccountIdentitiesPetnamesBridge.test.ts
+++ b/app/scripts/lib/AccountIdentitiesPetnamesBridge.test.ts
@@ -105,16 +105,22 @@ function createNameControllerMock(
   return {
     state,
     setName: jest.fn(),
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any;
 }
 
 function simulateSubscribe(
   messenger: jest.Mocked<AccountIdentitiesPetnamesBridgeMessenger>,
   stateChange: AccountsControllerState,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   patch: any[],
 ) {
   const listener = messenger.subscribe.mock.calls[0][1] as (
     stateChange: AccountsControllerState,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     patch: any[],
   ) => void;
   listener(stateChange, patch);
diff --git a/app/scripts/lib/AddressBookPetnamesBridge.test.ts b/app/scripts/lib/AddressBookPetnamesBridge.test.ts
index c98e6a5e309e..f95726fba7b2 100644
--- a/app/scripts/lib/AddressBookPetnamesBridge.test.ts
+++ b/app/scripts/lib/AddressBookPetnamesBridge.test.ts
@@ -37,12 +37,16 @@ function createNameControllerMock(
   return {
     state,
     setName: jest.fn(),
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any;
 }
 
 function createMessengerMock(): jest.Mocked<PetnamesBridgeMessenger> {
   return {
     subscribe: jest.fn(),
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any;
 }
 
diff --git a/app/scripts/lib/AddressBookPetnamesBridge.ts b/app/scripts/lib/AddressBookPetnamesBridge.ts
index e6f7e9813fa1..141814a9ef62 100644
--- a/app/scripts/lib/AddressBookPetnamesBridge.ts
+++ b/app/scripts/lib/AddressBookPetnamesBridge.ts
@@ -35,9 +35,13 @@ export class AddressBookPetnamesBridge extends AbstractPetnamesBridge {
     const entries: PetnameEntry[] = [];
     const { state } = this.#addressBookController;
     for (const chainId of Object.keys(state.addressBook)) {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const chainEntries = state.addressBook[chainId as any];
 
       for (const address of Object.keys(chainEntries)) {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const entry = state.addressBook[chainId as any][address];
         const normalizedChainId = chainId.toLowerCase();
         const { name, isEns } = entry;
@@ -64,11 +68,17 @@ export class AddressBookPetnamesBridge extends AbstractPetnamesBridge {
    */
   protected updateSourceEntry(type: ChangeType, entry: PetnameEntry): void {
     if (type === ChangeType.DELETED) {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       this.#addressBookController.delete(entry.variation as any, entry.value);
     } else {
       this.#addressBookController.set(
         entry.value,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         entry.name as any,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         entry.variation as any,
       );
     }
diff --git a/app/scripts/lib/SnapsNameProvider.test.ts b/app/scripts/lib/SnapsNameProvider.test.ts
index 6d6f0dd6a120..25a5f22a3f80 100644
--- a/app/scripts/lib/SnapsNameProvider.test.ts
+++ b/app/scripts/lib/SnapsNameProvider.test.ts
@@ -94,6 +94,8 @@ function createMockMessenger({
 
   return {
     call: callMock,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any;
 }
 
diff --git a/app/scripts/lib/WeakRefObjectMap.test.ts b/app/scripts/lib/WeakRefObjectMap.test.ts
new file mode 100644
index 000000000000..289bc4a8548c
--- /dev/null
+++ b/app/scripts/lib/WeakRefObjectMap.test.ts
@@ -0,0 +1,147 @@
+import { WeakRefObjectMap } from './WeakRefObjectMap';
+
+describe('WeakDomainProxyMap', () => {
+  let map: WeakRefObjectMap<Record<string, object>>;
+
+  beforeEach(() => {
+    map = new WeakRefObjectMap();
+  });
+
+  it('sets and gets a value', () => {
+    const key: string = 'testKey';
+    const value: { [key: string]: object } = { objKey: {} };
+    map.set(key, value);
+
+    const retrieved = map.get(key);
+    expect(retrieved).toHaveProperty('objKey');
+    expect(retrieved?.objKey).toBe(value.objKey);
+  });
+
+  it('confirms presence of a key with has()', () => {
+    const key: string = 'testKey';
+    const value: { [key: string]: object } = { objKey: {} };
+    map.set(key, value);
+
+    expect(map.has(key)).toBe(true);
+  });
+
+  it('deletes a key-value pair', () => {
+    const key: string = 'testKey';
+    const value: { [key: string]: object } = { objKey: {} };
+    map.set(key, value);
+
+    expect(map.has(key)).toBe(true);
+    map.delete(key);
+    expect(map.has(key)).toBe(false);
+  });
+
+  it('clears the map', () => {
+    map.set('key1', { objKey: {} });
+    map.set('key2', { objKey: {} });
+
+    map.clear();
+    expect(map.has('key1')).toBe(false);
+    expect(map.has('key2')).toBe(false);
+  });
+
+  it('get returns undefined for non-existent key', () => {
+    expect(map.get('nonExistentKey')).toBeUndefined();
+  });
+
+  it('delete returns false when key does not exist', () => {
+    expect(map.delete('nonExistentKey')).toBe(false);
+  });
+
+  describe('iterators', () => {
+    beforeEach(() => {
+      map = new WeakRefObjectMap();
+      map.set('key1', { objKey1: { detail: 'value1' } });
+      map.set('key2', { objKey2: { detail: 'value2' } });
+    });
+
+    it('iterates over entries correctly', () => {
+      const entries = Array.from(map.entries());
+      expect(entries.length).toBe(2);
+      expect(entries).toEqual(
+        expect.arrayContaining([
+          ['key1', { objKey1: { detail: 'value1' } }],
+          ['key2', { objKey2: { detail: 'value2' } }],
+        ]),
+      );
+    });
+
+    it('iterates over keys correctly', () => {
+      const keys = Array.from(map.keys());
+      expect(keys.length).toBe(2);
+      expect(keys).toEqual(expect.arrayContaining(['key1', 'key2']));
+    });
+
+    it('iterates over values correctly', () => {
+      const values = Array.from(map.values());
+      expect(values.length).toBe(2);
+      expect(values).toEqual(
+        expect.arrayContaining([
+          { objKey1: { detail: 'value1' } },
+          { objKey2: { detail: 'value2' } },
+        ]),
+      );
+    });
+
+    it('executes forEach callback correctly', () => {
+      const mockCallback = jest.fn();
+      map.forEach(mockCallback);
+
+      expect(mockCallback.mock.calls.length).toBe(2);
+      expect(mockCallback).toHaveBeenCalledWith(
+        { objKey1: { detail: 'value1' } },
+        'key1',
+        map,
+      );
+      expect(mockCallback).toHaveBeenCalledWith(
+        { objKey2: { detail: 'value2' } },
+        'key2',
+        map,
+      );
+    });
+
+    it('handles empty map in iterations', () => {
+      const emptyMap = new WeakRefObjectMap<Record<string, object>>();
+      expect(Array.from(emptyMap.entries()).length).toBe(0);
+      expect(Array.from(emptyMap.keys()).length).toBe(0);
+      expect(Array.from(emptyMap.values()).length).toBe(0);
+
+      const mockCallback = jest.fn();
+      emptyMap.forEach(mockCallback);
+      expect(mockCallback).not.toHaveBeenCalled();
+    });
+
+    it('[Symbol.iterator] behaves like entries', () => {
+      const iterator = map[Symbol.iterator]();
+      expect(Array.from(iterator)).toEqual(Array.from(map.entries()));
+    });
+  });
+});
+
+// Commenting until we figure out how best to expose garbage collection in jest env
+// describe('WeakDomainProxyMap with garbage collection', () => {
+//   it('cleans up weakly referenced objects after garbage collection', () => {
+//     if ((global as any).gc) {
+//       const map = new WeakDomainProxyMap();
+//       let obj: object = { a: 1 };
+//       map.set('key', { obj });
+
+//       expect(map.get('key')).toHaveProperty('obj', obj);
+
+//       obj = null!; // Remove the strong reference to the object
+
+//       (global as any).gc(); // Force garbage collection
+
+//       // The weakly referenced object should be gone after garbage collection.
+//       expect(map.get('key')).toBeUndefined();
+//     } else {
+//       console.warn(
+//         'Garbage collection is not exposed. Run Node.js with the --expose-gc flag.',
+//       );
+//     }
+//   });
+// });
diff --git a/app/scripts/lib/WeakRefObjectMap.ts b/app/scripts/lib/WeakRefObjectMap.ts
new file mode 100644
index 000000000000..56907926daa0
--- /dev/null
+++ b/app/scripts/lib/WeakRefObjectMap.ts
@@ -0,0 +1,218 @@
+type WeakRefObject<RecordType extends Record<string, object>> = {
+  [P in keyof RecordType]: WeakRef<RecordType[P]>;
+};
+
+/**
+ * `WeakRefObjectMap` is a custom map-like structure designed to hold key-value pairs where the values are objects.
+ * Unlike a standard `Map`, this implementation stores each property of the value objects as weak references.
+ * This means that the properties of the objects are not prevented from being garbage collected when there are no other
+ * references to them outside of this map.
+ *
+ * It is important to note that while the map itself behaves similarly to a standard `Map`, the weak references apply
+ * to each property of the objects stored as values. This means that individual properties of these objects may become
+ * unavailable (i.e., garbage collected) independently of one another. Users of this map should be prepared to handle
+ * cases where a property's value has been collected and is therefore `undefined`.
+ *
+ * This class was implemented to help with memory management of network client proxies used by the SelectedNetworkController
+ * to keep per domain selected networks in sync. The properties of the NetworkClient object (provider and blockTracker) are weakly
+ * referenced so that they can be garbage collected if/when a dapp connection ends without effective cleanup.
+ */
+
+export class WeakRefObjectMap<RecordType extends Record<string, object>>
+  implements Map<string, RecordType>
+{
+  /**
+   * Internal map to store keys and their corresponding weakly referenced object values.
+   */
+  private map: Map<string, WeakRefObject<RecordType>>;
+
+  constructor() {
+    this.map = new Map();
+  }
+
+  /**
+   * Associates a key with a value in the map. If the key already exists, its associated value is updated.
+   * The values are stored as weak references.
+   *
+   * @param key - The key under which to store the value.
+   * @param value - The value to store under the specified key. Must be an object.
+   * @returns The `WeakRefObjectMap` instance.
+   */
+  set(key: string, value: RecordType): this {
+    const weakRefValue: Partial<WeakRefObject<RecordType>> = {};
+    for (const keyValue in value) {
+      if (!Object.hasOwn(value, keyValue)) {
+        continue;
+      }
+      const item: RecordType[typeof keyValue] = value[keyValue];
+      if (typeof item === 'object' && item !== null) {
+        weakRefValue[keyValue] = new WeakRef(item);
+      } else {
+        throw new Error(
+          `Property ${String(
+            keyValue,
+          )} is not an object and cannot be weakly referenced.`,
+        );
+      }
+    }
+    this.map.set(key, weakRefValue as WeakRefObject<RecordType>);
+    return this;
+  }
+
+  /**
+   * Retrieves the value associated with the specified key. The value is dereferenced before being returned.
+   * If the key does not exist or the value has been garbage collected, `undefined` is returned.
+   *
+   * @param key - The key whose associated value is to be returned.
+   * @returns The dereferenced value associated with the key, or `undefined`.
+   */
+  get(key: string): RecordType | undefined {
+    const weakRefValue = this.map.get(key);
+    if (!weakRefValue) {
+      return undefined;
+    }
+
+    const deRefValue: Partial<RecordType> = {};
+    for (const keyValue in weakRefValue) {
+      if (!Object.hasOwn(weakRefValue, keyValue)) {
+        continue;
+      }
+      const deref = weakRefValue[keyValue].deref();
+      if (deref === undefined) {
+        this.map.delete(key);
+        return undefined;
+      }
+      deRefValue[keyValue] = deref;
+    }
+
+    return deRefValue as RecordType;
+  }
+
+  /**
+   * Checks whether the map contains the specified key.
+   *
+   * @param key - The key to check for presence in the map.
+   * @returns `true` if the map contains the key, otherwise `false`.
+   */
+  has(key: string): boolean {
+    return this.get(key) !== undefined;
+  }
+
+  /**
+   * Removes the specified key and its associated value from the map.
+   *
+   * @param key - The key to remove along with its associated value.
+   * @returns `true` if the element was successfully removed, otherwise `false`.
+   */
+  delete(key: string): boolean {
+    const value = this.get(key);
+    if (value !== undefined) {
+      return this.map.delete(key);
+    }
+    return false;
+  }
+
+  /**
+   * Removes all key-value pairs from the map.
+   */
+  clear() {
+    this.map.clear();
+  }
+
+  /**
+   * Returns the number of key-value pairs present in the map.
+   */
+  get size(): number {
+    return this.map.size;
+  }
+
+  /**
+   * Returns a new iterator object that contains an array of `[key, value]` for each element in the map.
+   * The values are dereferenced before being returned.
+   */
+  entries(): IterableIterator<[string, RecordType]> {
+    const entries: [string, RecordType][] = [];
+    this.map.forEach((_, key) => {
+      const derefValue = this.get(key);
+      if (derefValue !== undefined) {
+        entries.push([key, derefValue]);
+      }
+    });
+    return entries.values();
+  }
+
+  /**
+   * Returns a new iterator object that contains the keys for each element in the map.
+   */
+  keys(): IterableIterator<string> {
+    return this.map.keys();
+  }
+
+  /**
+   * Returns a new iterator object that contains the values for each element in the map.
+   * The values are dereferenced before being returned.
+   */
+  values(): IterableIterator<RecordType> {
+    const values: RecordType[] = [];
+    this.map.forEach((_, key) => {
+      const derefValue = this.get(key);
+      if (derefValue !== undefined) {
+        values.push(derefValue);
+      }
+    });
+    return values.values();
+  }
+
+  /**
+   * Returns a new iterator object that contains an array of `[key, value]` for each element in the map,
+   * making the map itself iterable.
+   */
+  [Symbol.iterator](): IterableIterator<[string, RecordType]> {
+    return this.entries();
+  }
+
+  /**
+   * Returns a string representing the map. This is used when converting the map to a string,
+   * e.g., by `Object.prototype.toString`.
+   */
+  get [Symbol.toStringTag](): string {
+    return 'WeakRefObjectMap';
+  }
+
+  /**
+   * Executes a provided function once for each key-value pair in the map, in insertion order.
+   * Note that the values passed to the callback function are the `WeakRefObject`s,
+   * not the dereferenced objects. This allows consumers to manage dereferencing according to their needs,
+   * acknowledging that some references may have been garbage collected.
+   *
+   * @param callback - Function to execute for each element, taking three arguments:
+   * - `value`: The value part of the key-value pair. Note that this is the weakly referenced object,
+   * encapsulated within a `WeakRefObject`, allowing for manual dereferencing.
+   * -`key`: The key part of the key-value pair.
+   * - `map`: The `WeakRefObjectMap` instance that the `forEach` method was called on.
+   * @param thisArg - Optional. Value to use as `this` when executing `callback`.
+   */
+  forEach(
+    callback: (
+      value: RecordType,
+      key: string,
+      map: Map<string, RecordType>,
+    ) => void,
+    // this is an unbound method, so the this value is unknown.
+    // Also the Map type this is based on uses any for this parameter as well.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    thisArg?: any,
+  ): void {
+    this.map.forEach((_, key) => {
+      const deRefValue = this.get(key);
+      if (deRefValue === undefined) {
+        return;
+      }
+      if (thisArg) {
+        callback.call(thisArg, deRefValue, key, this);
+      } else {
+        callback(deRefValue, key, this);
+      }
+    });
+  }
+}
diff --git a/app/scripts/lib/backup.test.js b/app/scripts/lib/backup.test.js
index ceab30f28188..81a7cd8c0093 100644
--- a/app/scripts/lib/backup.test.js
+++ b/app/scripts/lib/backup.test.js
@@ -161,6 +161,7 @@ const jsonData = JSON.stringify({
       showExtensionInFullSizeView: false,
       showFiatInTestnets: false,
       showTestNetworks: true,
+      smartTransactionsOptInStatus: false,
       useNativeCurrencyAsPrimaryCurrency: true,
     },
     ipfsGateway: 'dweb.link',
@@ -168,7 +169,7 @@ const jsonData = JSON.stringify({
     theme: 'light',
     customNetworkListEnabled: false,
     textDirection: 'auto',
-    useRequestQueue: false,
+    useRequestQueue: true,
   },
   internalAccounts: {
     accounts: {
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index ed3ebeae6f6a..e5175326edea 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -1,4 +1,4 @@
-import { detectSIWE } from '@metamask/controller-utils';
+import { ApprovalType, detectSIWE } from '@metamask/controller-utils';
 import { errorCodes } from 'eth-rpc-errors';
 import { isValidAddress } from 'ethereumjs-util';
 import { MESSAGE_TYPE, ORIGIN_METAMASK } from '../../../shared/constants/app';
@@ -7,7 +7,6 @@ import {
   MetaMetricsEventName,
   MetaMetricsEventUiCustomization,
 } from '../../../shared/constants/metametrics';
-import { SECOND } from '../../../shared/constants/time';
 
 import {
   BlockaidResultType,
@@ -18,25 +17,25 @@ import {
 
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 import { SIGNING_METHODS } from '../../../shared/constants/transaction';
-
 import { getBlockaidMetricsProps } from '../../../ui/helpers/utils/metrics';
 ///: END:ONLY_INCLUDE_IF
+import { REDESIGN_APPROVAL_TYPES } from '../../../ui/pages/confirmations/utils/confirm';
 import { getSnapAndHardwareInfoForMetrics } from './snap-keyring/metrics';
 
 /**
  * These types determine how the method tracking middleware handles incoming
- * requests based on the method name. There are three options right now but
- * the types could be expanded to cover other options in the future.
+ * requests based on the method name.
  */
 const RATE_LIMIT_TYPES = {
-  RATE_LIMITED: 'rate_limited',
+  TIMEOUT: 'timeout',
   BLOCKED: 'blocked',
   NON_RATE_LIMITED: 'non_rate_limited',
+  RANDOM_SAMPLE: 'random_sample',
 };
 
 /**
  * This object maps a method name to a RATE_LIMIT_TYPE. If not in this map the
- * default is 'RATE_LIMITED'
+ * default is RANDOM_SAMPLE
  */
 const RATE_LIMIT_MAP = {
   [MESSAGE_TYPE.ETH_SIGN]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
@@ -47,12 +46,25 @@ const RATE_LIMIT_MAP = {
   [MESSAGE_TYPE.ETH_DECRYPT]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
   [MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]:
     RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS]: RATE_LIMIT_TYPES.RATE_LIMITED,
-  [MESSAGE_TYPE.WALLET_REQUEST_PERMISSIONS]: RATE_LIMIT_TYPES.RATE_LIMITED,
+  [MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS]: RATE_LIMIT_TYPES.TIMEOUT,
+  [MESSAGE_TYPE.WALLET_REQUEST_PERMISSIONS]: RATE_LIMIT_TYPES.TIMEOUT,
   [MESSAGE_TYPE.SEND_METADATA]: RATE_LIMIT_TYPES.BLOCKED,
+  [MESSAGE_TYPE.ETH_CHAIN_ID]: RATE_LIMIT_TYPES.BLOCKED,
+  [MESSAGE_TYPE.ETH_ACCOUNTS]: RATE_LIMIT_TYPES.BLOCKED,
+  [MESSAGE_TYPE.LOG_WEB3_SHIM_USAGE]: RATE_LIMIT_TYPES.BLOCKED,
   [MESSAGE_TYPE.GET_PROVIDER_STATE]: RATE_LIMIT_TYPES.BLOCKED,
 };
 
+const MESSAGE_TYPE_TO_APPROVAL_TYPE = {
+  [MESSAGE_TYPE.PERSONAL_SIGN]: ApprovalType.PersonalSign,
+  [MESSAGE_TYPE.ETH_SIGN]: ApprovalType.Sign,
+  [MESSAGE_TYPE.SIGN]: ApprovalType.SignTransaction,
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA]: ApprovalType.EthSignTypedData,
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V1]: ApprovalType.EthSignTypedData,
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V3]: ApprovalType.EthSignTypedData,
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4]: ApprovalType.EthSignTypedData,
+};
+
 /**
  * For events with user interaction (approve / reject | cancel) this map will
  * return an object with APPROVED, REJECTED, REQUESTED, and FAILED keys that map to the
@@ -107,7 +119,8 @@ const EVENT_NAME_MAP = {
   },
 };
 
-const rateLimitTimeouts = {};
+const rateLimitTimeoutsByMethod = {};
+let globalRateLimitCount = 0;
 
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 /**
@@ -120,12 +133,19 @@ const rateLimitTimeouts = {};
  *  MetaMetricsController
  * @param {Function} opts.getMetricsState - get the state of
  *  MetaMetricsController
- * @param {number} [opts.rateLimitSeconds] - number of seconds to wait before
- *  allowing another set of events to be tracked.
+ * @param {number} [opts.rateLimitTimeout] - time, in milliseconds, to wait before
+ *  allowing another set of events to be tracked for methods rate limited by timeout.
+ * @param {number} [opts.rateLimitSamplePercent] - percentage, in decimal, of events
+ *  that should be tracked for methods rate limited by random sample.
  * @param {Function} opts.getAccountType
  * @param {Function} opts.getDeviceModel
+ * @param {Function} opts.isConfirmationRedesignEnabled
  * @param {RestrictedControllerMessenger} opts.snapAndHardwareMessenger
  * @param {AppStateController} opts.appStateController
+ * @param {number} [opts.globalRateLimitTimeout] - time, in milliseconds, of the sliding
+ * time window that should limit the number of method calls tracked to globalRateLimitMaxAmount.
+ * @param {number} [opts.globalRateLimitMaxAmount] - max number of method calls that should
+ * tracked within the globalRateLimitTimeout time window.
  * @returns {Function}
  */
 ///: END:ONLY_INCLUDE_IF
@@ -133,9 +153,13 @@ const rateLimitTimeouts = {};
 export default function createRPCMethodTrackingMiddleware({
   trackEvent,
   getMetricsState,
-  rateLimitSeconds = 60 * 5,
+  rateLimitTimeout = 60 * 5 * 1000, // 5 minutes
+  rateLimitSamplePercent = 0.001, // 0.1%
+  globalRateLimitTimeout = 60 * 5 * 1000, // 5 minutes
+  globalRateLimitMaxAmount = 10, // max of events in the globalRateLimitTimeout window. pass 0 for no global rate limit
   getAccountType,
   getDeviceModel,
+  isConfirmationRedesignEnabled,
   snapAndHardwareMessenger,
   ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
   appStateController,
@@ -148,14 +172,30 @@ export default function createRPCMethodTrackingMiddleware({
   ) {
     const { origin, method } = req;
 
-    // Determine what type of rate limit to apply based on method
     const rateLimitType =
-      RATE_LIMIT_MAP[method] ?? RATE_LIMIT_TYPES.RATE_LIMITED;
+      RATE_LIMIT_MAP[method] ?? RATE_LIMIT_TYPES.RANDOM_SAMPLE;
+
+    let isRateLimited;
+    switch (rateLimitType) {
+      case RATE_LIMIT_TYPES.TIMEOUT:
+        isRateLimited =
+          typeof rateLimitTimeoutsByMethod[method] !== 'undefined';
+        break;
+      case RATE_LIMIT_TYPES.NON_RATE_LIMITED:
+        isRateLimited = false;
+        break;
+      case RATE_LIMIT_TYPES.BLOCKED:
+        isRateLimited = true;
+        break;
+      default:
+      case RATE_LIMIT_TYPES.RANDOM_SAMPLE:
+        isRateLimited = Math.random() >= rateLimitSamplePercent;
+        break;
+    }
 
-    // If the rateLimitType is RATE_LIMITED check the rateLimitTimeouts
-    const rateLimited =
-      rateLimitType === RATE_LIMIT_TYPES.RATE_LIMITED &&
-      typeof rateLimitTimeouts[method] !== 'undefined';
+    const isGlobalRateLimited =
+      globalRateLimitMaxAmount > 0 &&
+      globalRateLimitCount >= globalRateLimitMaxAmount;
 
     // Get the participateInMetaMetrics state to determine if we should track
     // anything. This is extra redundancy because this value is checked in
@@ -173,10 +213,10 @@ export default function createRPCMethodTrackingMiddleware({
     const shouldTrackEvent =
       // Don't track if the request came from our own UI or background
       origin !== ORIGIN_METAMASK &&
-      // Don't track if this is a blocked method
-      rateLimitType !== RATE_LIMIT_TYPES.BLOCKED &&
       // Don't track if the rate limit has been hit
-      rateLimited === false &&
+      !isRateLimited &&
+      // Don't track if the global rate limit has been hit
+      !isGlobalRateLimited &&
       // Don't track if the user isn't participating in metametrics
       userParticipatingInMetaMetrics === true;
 
@@ -223,6 +263,18 @@ export default function createRPCMethodTrackingMiddleware({
             req.securityAlertResponse.description;
         }
         ///: END:ONLY_INCLUDE_IF
+        const isConfirmationRedesign =
+          isConfirmationRedesignEnabled() &&
+          REDESIGN_APPROVAL_TYPES.find(
+            (type) => type === MESSAGE_TYPE_TO_APPROVAL_TYPE[method],
+          );
+
+        if (isConfirmationRedesign) {
+          eventProperties.ui_customizations = [
+            ...(eventProperties.ui_customizations || []),
+            MetaMetricsEventUiCustomization.RedesignedConfirmation,
+          ];
+        }
 
         const snapAndHardwareInfo = await getSnapAndHardwareInfoForMetrics(
           getAccountType,
@@ -237,9 +289,10 @@ export default function createRPCMethodTrackingMiddleware({
           if (method === MESSAGE_TYPE.PERSONAL_SIGN) {
             const { isSIWEMessage } = detectSIWE({ data });
             if (isSIWEMessage) {
-              eventProperties.ui_customizations = (
-                eventProperties.ui_customizations || []
-              ).concat(MetaMetricsEventUiCustomization.Siwe);
+              eventProperties.ui_customizations = [
+                ...(eventProperties.ui_customizations || []),
+                MetaMetricsEventUiCustomization.Siwe,
+              ];
             }
           }
         } catch (e) {
@@ -258,9 +311,16 @@ export default function createRPCMethodTrackingMiddleware({
         properties: eventProperties,
       });
 
-      rateLimitTimeouts[method] = setTimeout(() => {
-        delete rateLimitTimeouts[method];
-      }, SECOND * rateLimitSeconds);
+      if (rateLimitType === RATE_LIMIT_TYPES.TIMEOUT) {
+        rateLimitTimeoutsByMethod[method] = setTimeout(() => {
+          delete rateLimitTimeoutsByMethod[method];
+        }, rateLimitTimeout);
+      }
+
+      globalRateLimitCount += 1;
+      setTimeout(() => {
+        globalRateLimitCount -= 1;
+      }, globalRateLimitTimeout);
     }
 
     next(async (callback) => {
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
index 68dec85ccb12..347ef963b1b6 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -2,6 +2,7 @@ import { errorCodes } from 'eth-rpc-errors';
 import { detectSIWE } from '@metamask/controller-utils';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 import {
+  MetaMetricsEventCategory,
   MetaMetricsEventName,
   MetaMetricsEventUiCustomization,
 } from '../../../shared/constants/metametrics';
@@ -34,12 +35,18 @@ const appStateController = {
   },
 };
 
-const handler = createRPCMethodTrackingMiddleware({
-  trackEvent,
-  getMetricsState,
-  rateLimitSeconds: 1,
-  appStateController,
-});
+const createHandler = (opts) =>
+  createRPCMethodTrackingMiddleware({
+    trackEvent,
+    getMetricsState,
+    rateLimitTimeout: 1000,
+    rateLimitSamplePercent: 0.1,
+    globalRateLimitTimeout: 0,
+    globalRateLimitMaxAmount: 0,
+    appStateController,
+    isConfirmationRedesignEnabled: () => false,
+    ...opts,
+  });
 
 function getNext(timeout = 500) {
   let deferred;
@@ -98,6 +105,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { executeMiddlewareStack, next } = getNext();
+      const handler = createHandler();
       handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).not.toHaveBeenCalled();
@@ -119,6 +127,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { executeMiddlewareStack, next } = getNext();
+      const handler = createHandler();
       handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).not.toHaveBeenCalled();
@@ -145,10 +154,11 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { next } = getNext();
+      const handler = createHandler();
       await handler(req, res, next);
       expect(trackEvent).toHaveBeenCalledTimes(1);
       expect(trackEvent.mock.calls[0][0]).toMatchObject({
-        category: 'inpage_provider',
+        category: MetaMetricsEventCategory.InpageProvider,
         event: MetaMetricsEventName.SignatureRequested,
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN,
@@ -178,6 +188,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { next } = getNext();
+      const handler = createHandler();
       await handler(req, res, next);
       expect(trackEvent).toHaveBeenCalledTimes(1);
       /**
@@ -188,7 +199,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
        *
        */
       expect(trackEvent.mock.calls[0][0]).toStrictEqual({
-        category: 'inpage_provider',
+        category: MetaMetricsEventCategory.InpageProvider,
         event: MetaMetricsEventName.SignatureRequested,
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN,
@@ -211,11 +222,12 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { next, executeMiddlewareStack } = getNext();
+      const handler = createHandler();
       await handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
-        category: 'inpage_provider',
+        category: MetaMetricsEventCategory.InpageProvider,
         event: MetaMetricsEventName.SignatureApproved,
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
@@ -234,11 +246,12 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: { code: errorCodes.provider.userRejectedRequest },
       };
       const { next, executeMiddlewareStack } = getNext();
+      const handler = createHandler();
       await handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
-        category: 'inpage_provider',
+        category: MetaMetricsEventCategory.InpageProvider,
         event: MetaMetricsEventName.SignatureRejected,
         properties: {
           signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
@@ -255,11 +268,12 @@ describe('createRPCMethodTrackingMiddleware', () => {
 
       const res = {};
       const { next, executeMiddlewareStack } = getNext();
+      const handler = createHandler();
       await handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
-        category: 'inpage_provider',
+        category: MetaMetricsEventCategory.InpageProvider,
         event: MetaMetricsEventName.PermissionsApproved,
         properties: { method: MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS },
         referrer: { url: 'some.dapp' },
@@ -276,36 +290,189 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { next, executeMiddlewareStack } = getNext();
+      const handler = createHandler();
       handler(req, res, next);
       expect(trackEvent).not.toHaveBeenCalled();
       executeMiddlewareStack();
     });
 
-    it(`should only track events when not rate limited`, async () => {
+    describe('events rated limited by timeout', () => {
+      it.each([
+        ['wallet_requestPermissions', 2],
+        ['eth_requestAccounts', 2],
+      ])(
+        `should only track '%s' events while the timeout rate limit is not active`,
+        async (method, eventsTrackedPerRequest) => {
+          const req = {
+            method,
+            origin: 'some.dapp',
+          };
+
+          const res = {
+            error: null,
+          };
+
+          const handler = createHandler();
+
+          let callCount = 0;
+          while (callCount < 3) {
+            callCount += 1;
+            const { next, executeMiddlewareStack } = getNext();
+            handler(req, res, next);
+            await executeMiddlewareStack();
+            if (callCount !== 3) {
+              await waitForSeconds(0.6);
+            }
+          }
+
+          const expectedNumberOfCalls = 2 * eventsTrackedPerRequest;
+          expect(trackEvent).toHaveBeenCalledTimes(expectedNumberOfCalls);
+          trackEvent.mock.calls.forEach((call) => {
+            expect(call[0].properties.method).toBe(method);
+          });
+        },
+      );
+    });
+
+    describe('events rated limited by random', () => {
+      beforeEach(() => {
+        jest
+          .spyOn(Math, 'random')
+          .mockReturnValueOnce(0) // not rate limited
+          .mockReturnValueOnce(0.09) // not rate limited
+          .mockReturnValueOnce(0.1) // rate limited
+          .mockReturnValueOnce(0.11) // rate limited
+          .mockReturnValueOnce(1); // rate limited
+      });
+      afterEach(() => {
+        jest.spyOn(Math, 'random').mockRestore();
+      });
+      it.each([
+        ['any_method_without_rate_limit_type_set', 1],
+        ['eth_getBalance', 1],
+      ])(
+        `should only track a random percentage of '%s' events`,
+        async (method, eventsTrackedPerRequest) => {
+          const req = {
+            method,
+            origin: 'some.dapp',
+          };
+
+          const res = {
+            error: null,
+          };
+
+          const handler = createHandler();
+
+          let callCount = 0;
+          while (callCount < 5) {
+            callCount += 1;
+            const { next, executeMiddlewareStack } = getNext();
+            handler(req, res, next);
+            await executeMiddlewareStack();
+          }
+
+          const expectedNumberOfCalls = 2 * eventsTrackedPerRequest;
+          expect(trackEvent).toHaveBeenCalledTimes(expectedNumberOfCalls);
+          trackEvent.mock.calls.forEach((call) => {
+            expect(call[0].properties.method).toBe(method);
+          });
+        },
+      );
+    });
+
+    describe('events rated globally rate limited', () => {
+      it('should only track events if the global rate limit has not been hit', async () => {
+        const req = {
+          method: 'some_method_rate_limited_by_sample',
+          origin: 'some.dapp',
+        };
+
+        const res = {
+          error: null,
+        };
+
+        const handler = createHandler({
+          rateLimitSamplePercent: 1, // track every event for this spec
+          globalRateLimitTimeout: 1000,
+          globalRateLimitMaxAmount: 3,
+        });
+
+        let callCount = 0;
+        while (callCount < 4) {
+          callCount += 1;
+          const { next, executeMiddlewareStack } = getNext();
+          handler(req, res, next);
+          await executeMiddlewareStack();
+          if (callCount !== 4) {
+            await waitForSeconds(0.6);
+          }
+        }
+
+        expect(trackEvent).toHaveBeenCalledTimes(3);
+        trackEvent.mock.calls.forEach((call) => {
+          expect(call[0].properties.method).toBe(
+            'some_method_rate_limited_by_sample',
+          );
+        });
+      });
+    });
+
+    it('should track Confirmation Redesign through ui_customizations prop if enabled', async () => {
       const req = {
-        method: 'eth_chainId',
+        method: MESSAGE_TYPE.PERSONAL_SIGN,
         origin: 'some.dapp',
       };
-
       const res = {
         error: null,
       };
+      const { next, executeMiddlewareStack } = getNext();
+      const handler = createHandler({
+        isConfirmationRedesignEnabled: () => true,
+      });
 
-      let callCount = 0;
+      await handler(req, res, next);
+      await executeMiddlewareStack();
 
-      while (callCount < 3) {
-        callCount += 1;
-        const { next, executeMiddlewareStack } = getNext();
-        handler(req, res, next);
-        await executeMiddlewareStack();
-        if (callCount !== 3) {
-          await waitForSeconds(0.6);
-        }
-      }
+      expect(trackEvent).toHaveBeenCalledTimes(2);
+
+      expect(trackEvent.mock.calls[1][0]).toMatchObject({
+        category: MetaMetricsEventCategory.InpageProvider,
+        event: MetaMetricsEventName.SignatureApproved,
+        properties: {
+          signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
+          ui_customizations: [
+            MetaMetricsEventUiCustomization.RedesignedConfirmation,
+          ],
+        },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+
+    it('should not track Confirmation Redesign through ui_customizations prop if not enabled', async () => {
+      const req = {
+        method: MESSAGE_TYPE.PERSONAL_SIGN,
+        origin: 'some.dapp',
+      };
+      const res = {
+        error: null,
+      };
+      const { next, executeMiddlewareStack } = getNext();
+      const handler = createHandler();
+
+      await handler(req, res, next);
+      await executeMiddlewareStack();
 
       expect(trackEvent).toHaveBeenCalledTimes(2);
-      expect(trackEvent.mock.calls[0][0].properties.method).toBe('eth_chainId');
-      expect(trackEvent.mock.calls[1][0].properties.method).toBe('eth_chainId');
+
+      expect(trackEvent.mock.calls[1][0]).toMatchObject({
+        category: MetaMetricsEventCategory.InpageProvider,
+        event: MetaMetricsEventName.SignatureApproved,
+        properties: {
+          signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
+        },
+        referrer: { url: 'some.dapp' },
+      });
     });
 
     it('should track Sign-in With Ethereum (SIWE) message if detected', async () => {
@@ -317,6 +484,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { next, executeMiddlewareStack } = getNext();
+      const handler = createHandler();
 
       detectSIWE.mockImplementation(() => {
         return { isSIWEMessage: true };
@@ -328,7 +496,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       expect(trackEvent).toHaveBeenCalledTimes(2);
 
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
-        category: 'inpage_provider',
+        category: MetaMetricsEventCategory.InpageProvider,
         event: MetaMetricsEventName.SignatureApproved,
         properties: {
           signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
@@ -349,6 +517,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
           error: mockError,
         };
         const { next, executeMiddlewareStack } = getNext();
+        const handler = createHandler();
 
         await handler(req, res, next);
         await executeMiddlewareStack();
@@ -356,7 +525,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         expect(trackEvent).toHaveBeenCalledTimes(2);
 
         expect(trackEvent.mock.calls[1][0]).toMatchObject({
-          category: 'inpage_provider',
+          category: MetaMetricsEventCategory.InpageProvider,
           event: MetaMetricsEventName.SignatureFailed,
           properties: {
             signature_type: MESSAGE_TYPE.ETH_SIGN,
@@ -377,12 +546,13 @@ describe('createRPCMethodTrackingMiddleware', () => {
           error: null,
         };
         const { next } = getNext();
+        const handler = createHandler();
 
         await handler(req, res, next);
 
         expect(trackEvent).toHaveBeenCalledTimes(1);
         expect(trackEvent.mock.calls[0][0]).toMatchObject({
-          category: 'inpage_provider',
+          category: MetaMetricsEventCategory.InpageProvider,
           event: MetaMetricsEventName.SignatureRequested,
           properties: {
             signature_type: MESSAGE_TYPE.ETH_SIGN,
diff --git a/app/scripts/lib/encryptor-factory.test.ts b/app/scripts/lib/encryptor-factory.test.ts
new file mode 100644
index 000000000000..5e8b10feb152
--- /dev/null
+++ b/app/scripts/lib/encryptor-factory.test.ts
@@ -0,0 +1,257 @@
+import * as browserPassworder from '@metamask/browser-passworder';
+import { encryptorFactory } from './encryptor-factory';
+
+jest.mock('@metamask/browser-passworder');
+
+const mockIterations = 100;
+const mockPassword = 'password';
+const mockSalt = 'salt';
+const mockData = 'data';
+
+describe('encryptorFactory', () => {
+  afterEach(async () => {
+    jest.resetAllMocks();
+  });
+
+  const mockBrowserPassworder = browserPassworder as jest.Mocked<
+    typeof browserPassworder
+  >;
+
+  it('should return an object with browser passworder methods', () => {
+    const encryptor = encryptorFactory(mockIterations);
+
+    [
+      'encrypt',
+      'encryptWithDetail',
+      'encryptWithKey',
+      'decrypt',
+      'decryptWithDetail',
+      'decryptWithKey',
+      'keyFromPassword',
+      'importKey',
+      'exportKey',
+      'generateSalt',
+      'isVaultUpdated',
+    ].forEach((method) => {
+      expect(encryptor).toHaveProperty(method);
+    });
+  });
+
+  describe('encrypt', () => {
+    it('should call browser-passworder.encrypt with the given password, data, and iterations', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.encrypt(mockPassword, mockData);
+
+      expect(mockBrowserPassworder.encrypt).toHaveBeenCalledWith(
+        mockPassword,
+        mockData,
+        undefined,
+        undefined,
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      );
+    });
+
+    it('should return the result of browser-passworder.encrypt', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = 'result';
+      mockBrowserPassworder.encrypt.mockResolvedValue(mockResult);
+
+      expect(await encryptor.encrypt(mockPassword, mockData)).toBe(mockResult);
+    });
+  });
+
+  describe('encryptWithDetail', () => {
+    it('should call browser-passworder.encryptWithDetail with the given password, object, and iterations', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.encryptWithDetail(mockPassword, { foo: 'bar' }, 'salt');
+
+      expect(mockBrowserPassworder.encryptWithDetail).toHaveBeenCalledWith(
+        mockPassword,
+        { foo: 'bar' },
+        'salt',
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      );
+    });
+
+    it('should return the result of browser-passworder.encryptWithDetail', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = {
+        vault: 'vault',
+        exportedKeyString: 'salt',
+      };
+      mockBrowserPassworder.encryptWithDetail.mockResolvedValue(mockResult);
+
+      expect(
+        await encryptor.encryptWithDetail(mockPassword, { foo: 'bar' }, 'salt'),
+      ).toBe(mockResult);
+    });
+  });
+
+  describe('decrypt', () => {
+    it('should call browser-passworder.decrypt with the given password, data, and iterations', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.decrypt(mockPassword, mockData);
+
+      expect(mockBrowserPassworder.decrypt).toHaveBeenCalledWith(
+        mockPassword,
+        mockData,
+      );
+    });
+
+    it('should return the result of browser-passworder.decrypt', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = 'result';
+      mockBrowserPassworder.decrypt.mockResolvedValue(mockResult);
+
+      expect(await encryptor.decrypt(mockPassword, mockData)).toBe(mockResult);
+    });
+  });
+
+  describe('decryptWithDetail', () => {
+    it('should call browser-passworder.decryptWithDetail with the given password and object', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      await encryptor.decryptWithDetail(mockPassword, mockData);
+
+      expect(mockBrowserPassworder.decryptWithDetail).toHaveBeenCalledWith(
+        mockPassword,
+        mockData,
+      );
+    });
+
+    it('should return the result of browser-passworder.decryptWithDetail', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = {
+        exportedKeyString: 'key',
+        vault: 'data',
+        salt: 'salt',
+      };
+      mockBrowserPassworder.decryptWithDetail.mockResolvedValue(mockResult);
+
+      expect(await encryptor.decryptWithDetail(mockPassword, mockData)).toBe(
+        mockResult,
+      );
+    });
+  });
+
+  describe('keyFromPassword', () => {
+    it('should call browser-passworder.keyFromPassword with the given parameters', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      const keyDerivationOpts = {
+        algorithm: 'PBKDF2' as const,
+        params: {
+          iterations: 1,
+        },
+      };
+
+      const mockResult = {
+        key: 'key',
+        derivationOptions: keyDerivationOpts,
+      };
+
+      // @ts-expect-error The key type is a mock type and not valid.
+      mockBrowserPassworder.keyFromPassword.mockResolvedValue(mockResult);
+
+      expect(
+        await encryptor.keyFromPassword(
+          mockPassword,
+          mockSalt,
+          true,
+          keyDerivationOpts,
+        ),
+      ).toBe(mockResult);
+
+      expect(mockBrowserPassworder.keyFromPassword).toHaveBeenCalledWith(
+        mockPassword,
+        mockSalt,
+        true,
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: 1,
+          },
+        },
+      );
+    });
+
+    it('should call browser-passworder.keyFromPassword with overriden opts', async () => {
+      const encryptor = encryptorFactory(mockIterations);
+
+      const mockResult = {
+        key: 'key',
+        derivationOptions: {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      };
+
+      // @ts-expect-error The key type is a mock type and not valid.
+      mockBrowserPassworder.keyFromPassword.mockResolvedValue(mockResult);
+
+      expect(
+        await encryptor.keyFromPassword(
+          mockPassword,
+          mockSalt,
+          true,
+          undefined,
+        ),
+      ).toBe(mockResult);
+
+      expect(mockBrowserPassworder.keyFromPassword).toHaveBeenCalledWith(
+        mockPassword,
+        mockSalt,
+        true,
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      );
+    });
+  });
+
+  describe('isVaultUpdated', () => {
+    it('should call browser-passworder.isVaultUpdated with the given vault and iterations', () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockVault = 'vault';
+
+      encryptor.isVaultUpdated(mockVault);
+
+      expect(mockBrowserPassworder.isVaultUpdated).toHaveBeenCalledWith(
+        mockVault,
+        {
+          algorithm: 'PBKDF2',
+          params: {
+            iterations: mockIterations,
+          },
+        },
+      );
+    });
+
+    it('should return the result of browser-passworder.isVaultUpdated', () => {
+      const encryptor = encryptorFactory(mockIterations);
+      const mockResult = false;
+      const mockVault = 'vault';
+      mockBrowserPassworder.isVaultUpdated.mockReturnValue(mockResult);
+
+      expect(encryptor.isVaultUpdated(mockVault)).toBe(mockResult);
+    });
+  });
+});
diff --git a/app/scripts/lib/encryptor-factory.ts b/app/scripts/lib/encryptor-factory.ts
index 68f8ee42307e..9f8ba0a303fb 100644
--- a/app/scripts/lib/encryptor-factory.ts
+++ b/app/scripts/lib/encryptor-factory.ts
@@ -8,7 +8,10 @@ import {
   isVaultUpdated,
   keyFromPassword,
   importKey,
+  exportKey,
+  generateSalt,
   EncryptionKey,
+  KeyDerivationOptions,
 } from '@metamask/browser-passworder';
 
 /**
@@ -50,6 +53,36 @@ const encryptWithDetailFactory =
       },
     });
 
+/**
+ * A factory function for the keyFromPassword method of the browser-passworder library,
+ * that generates a key from a password and a salt.
+ *
+ * This factory function overrides the default key derivation options with the specified
+ * number of iterations, unless existing key derivation options are passed in.
+ *
+ * @param iterations - The number of iterations to use for the PBKDF2 algorithm.
+ * @returns A function that generates a key with a potentially overriden number of iterations.
+ */
+const keyFromPasswordFactory =
+  (iterations: number) =>
+  async (
+    password: string,
+    salt: string,
+    exportable?: boolean,
+    opts?: KeyDerivationOptions,
+  ) =>
+    keyFromPassword(
+      password,
+      salt,
+      exportable,
+      opts ?? {
+        algorithm: 'PBKDF2',
+        params: {
+          iterations,
+        },
+      },
+    );
+
 /**
  * A factory function for the isVaultUpdated method of the browser-passworder library,
  * that checks if the given vault was encrypted with the given number of iterations.
@@ -57,7 +90,7 @@ const encryptWithDetailFactory =
  * @param iterations - The number of iterations to use for the PBKDF2 algorithm.
  * @returns A function that checks if the vault was encrypted with the given number of iterations.
  */
-const isVaultUpdatedFactory = (iterations: number) => async (vault: string) =>
+const isVaultUpdatedFactory = (iterations: number) => (vault: string) =>
   isVaultUpdated(vault, {
     algorithm: 'PBKDF2',
     params: {
@@ -81,7 +114,9 @@ export const encryptorFactory = (iterations: number) => ({
   decrypt,
   decryptWithKey,
   decryptWithDetail,
-  keyFromPassword,
+  keyFromPassword: keyFromPasswordFactory(iterations),
   isVaultUpdated: isVaultUpdatedFactory(iterations),
   importKey,
+  exportKey,
+  generateSalt,
 });
diff --git a/app/scripts/lib/keyring-snaps-permissions.test.ts b/app/scripts/lib/keyring-snaps-permissions.test.ts
index afe4b40fefa6..3e457df2e258 100644
--- a/app/scripts/lib/keyring-snaps-permissions.test.ts
+++ b/app/scripts/lib/keyring-snaps-permissions.test.ts
@@ -15,6 +15,8 @@ describe('keyringSnapPermissionsBuilder', () => {
       registerActionHandler: jest.fn(),
       registerInitialEventPayload: jest.fn(),
       publish: jest.fn(),
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any,
     state: {},
   });
@@ -85,6 +87,8 @@ describe('keyringSnapPermissionsBuilder', () => {
   ])('"%s" cannot call any methods', (origin) => {
     const permissions = keyringSnapPermissionsBuilder(
       mockController,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       origin as any,
     );
     expect(permissions()).toStrictEqual([]);
@@ -106,6 +110,8 @@ describe('isProtocolAllowed', () => {
     [1, false],
     [0, false],
     [-1, false],
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ])('"%s" cannot call any methods', (origin: any, expected: boolean) => {
     expect(isProtocolAllowed(origin)).toBe(expected);
   });
diff --git a/app/scripts/lib/notification-manager.js b/app/scripts/lib/notification-manager.js
index 225d2f3c5ef5..4fe538188ba3 100644
--- a/app/scripts/lib/notification-manager.js
+++ b/app/scripts/lib/notification-manager.js
@@ -1,8 +1,9 @@
 import EventEmitter from '@metamask/safe-event-emitter';
 import ExtensionPlatform from '../platforms/extension';
-
-const NOTIFICATION_HEIGHT = 620;
-const NOTIFICATION_WIDTH = 360;
+import {
+  NOTIFICATION_HEIGHT,
+  NOTIFICATION_WIDTH,
+} from '../../../shared/constants/notifications';
 
 export const NOTIFICATION_MANAGER_EVENTS = {
   POPUP_CLOSED: 'onPopupClosed',
diff --git a/app/scripts/lib/offscreen-bridge/lattice-offscreen-keyring.ts b/app/scripts/lib/offscreen-bridge/lattice-offscreen-keyring.ts
index c690c1004382..27993e04d03c 100644
--- a/app/scripts/lib/offscreen-bridge/lattice-offscreen-keyring.ts
+++ b/app/scripts/lib/offscreen-bridge/lattice-offscreen-keyring.ts
@@ -61,6 +61,8 @@ class LatticeKeyringOffscreen extends LatticeKeyring {
       });
 
       return creds;
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       throw new Error(err);
     }
diff --git a/app/scripts/lib/ppom/indexed-db-backend.ts b/app/scripts/lib/ppom/indexed-db-backend.ts
index 41c5af2629d1..8fbf63c1aced 100644
--- a/app/scripts/lib/ppom/indexed-db-backend.ts
+++ b/app/scripts/lib/ppom/indexed-db-backend.ts
@@ -38,6 +38,8 @@ export class IndexedDBPPOMStorage implements StorageBackend {
         reject(
           new Error(
             `Failed to open database ${this.storeName}: ${
+              // TODO: Replace `any` with type
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
               (event.target as any)?.error
             }`,
           ),
@@ -65,8 +67,12 @@ export class IndexedDBPPOMStorage implements StorageBackend {
 
   private async objectStoreAction(
     method: 'get' | 'delete' | 'put' | 'getAllKeys',
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     args?: any,
     mode: IDBTransactionMode = 'readonly',
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<any> {
     return new Promise<Event>((resolve, reject) => {
       this.#getObjectStore(mode)
@@ -81,6 +87,8 @@ export class IndexedDBPPOMStorage implements StorageBackend {
             reject(
               new Error(
                 `Error in indexDB operation ${method}: ${
+                  // TODO: Replace `any` with type
+                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
                   (event.target as any)?.error
                 }`,
               ),
@@ -95,6 +103,8 @@ export class IndexedDBPPOMStorage implements StorageBackend {
 
   async read(key: StorageKey, checksum: string): Promise<ArrayBuffer> {
     const event = await this.objectStoreAction('get', [key.name, key.chainId]);
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const data = (event.target as any)?.result?.data;
     await validateChecksum(key, data, checksum);
     return data;
@@ -119,6 +129,8 @@ export class IndexedDBPPOMStorage implements StorageBackend {
 
   async dir(): Promise<StorageKey[]> {
     const event = await this.objectStoreAction('getAllKeys');
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return (event.target as any)?.result.map(([name, chainId]: string[]) => ({
       name,
       chainId,
diff --git a/app/scripts/lib/ppom/ppom-middleware.test.ts b/app/scripts/lib/ppom/ppom-middleware.test.ts
index de3cff83f93a..370acc51e944 100644
--- a/app/scripts/lib/ppom/ppom-middleware.test.ts
+++ b/app/scripts/lib/ppom/ppom-middleware.test.ts
@@ -1,4 +1,11 @@
+import {
+  type Hex,
+  JsonRpcRequestStruct,
+  JsonRpcResponseStruct,
+} from '@metamask/utils';
+import { waitFor } from '@testing-library/react';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
+
 import {
   BlockaidReason,
   BlockaidResultType,
@@ -19,10 +26,24 @@ Object.defineProperty(globalThis, 'performance', {
 });
 
 const createMiddleWare = (
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   usePPOM?: any,
-  securityAlertsEnabled?: boolean,
-  chainId?: string,
+  options: {
+    securityAlertsEnabled?: boolean;
+    chainId?: Hex;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    mockUpdateSecurityAlertResponseByTxId?: any;
+  } = {
+    mockUpdateSecurityAlertResponseByTxId: () => undefined,
+  },
 ) => {
+  const {
+    securityAlertsEnabled,
+    chainId,
+    mockUpdateSecurityAlertResponseByTxId,
+  } = options;
   const usePPOMMock = jest.fn();
   const ppomController = {
     usePPOM: usePPOM || usePPOMMock,
@@ -43,11 +64,19 @@ const createMiddleWare = (
   };
 
   return createPPOMMiddleware(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ppomController as any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     preferenceController as any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     networkController as any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     appStateController as any,
-    () => undefined,
+    mockUpdateSecurityAlertResponseByTxId,
   );
 };
 
@@ -64,28 +93,87 @@ describe('PPOMMiddleware', () => {
     const usePPOMMock = jest.fn();
     const middlewareFunction = createMiddleWare(usePPOMMock);
     await middlewareFunction(
-      { method: 'eth_sendTransaction' },
-      undefined,
+      { ...JsonRpcRequestStruct, method: 'eth_sendTransaction' },
+      { ...JsonRpcResponseStruct },
       () => undefined,
     );
     expect(usePPOMMock).toHaveBeenCalledTimes(1);
   });
 
-  it('should add validation response on confirmation requests', async () => {
+  it('adds loading response to confirmation requests while validation is in progress', async () => {
     const usePPOM = async () => Promise.resolve('VALIDATION_RESULT');
     const middlewareFunction = createMiddleWare(usePPOM);
     const req = {
+      ...JsonRpcRequestStruct,
       method: 'eth_sendTransaction',
       securityAlertResponse: undefined,
     };
-    await middlewareFunction(req, undefined, () => undefined);
-    expect(req.securityAlertResponse).toBeDefined();
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct },
+      () => undefined,
+    );
+
+    expect(req.securityAlertResponse.reason).toBe(BlockaidResultType.Loading);
+    expect(req.securityAlertResponse.result_type).toBe(
+      BlockaidReason.inProgress,
+    );
+  });
+
+  it('adds validation response to confirmation requests on supported networks', async () => {
+    const validateMock = jest.fn().mockImplementation(() =>
+      Promise.resolve({
+        result_type: BlockaidResultType.Malicious,
+        reason: BlockaidReason.permitFarming,
+      }),
+    );
+
+    const ppom = {
+      validateJsonRpc: validateMock,
+    };
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const usePPOM = async (callback: any) => {
+      callback(ppom);
+    };
+    const mockUpdateSecurityAlertResponseByTxId = jest.fn();
+    const middlewareFunction = createMiddleWare(usePPOM, {
+      chainId: '0xa',
+      mockUpdateSecurityAlertResponseByTxId,
+    });
+    const req = {
+      ...JsonRpcRequestStruct,
+      method: 'eth_sendTransaction',
+      securityAlertResponse: undefined,
+    };
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct },
+      () => undefined,
+    );
+
+    await waitFor(() => {
+      const mockCallSecurityAlertResponse =
+        mockUpdateSecurityAlertResponseByTxId.mock.calls[0][1];
+
+      expect(mockCallSecurityAlertResponse.result_type).toBe(
+        BlockaidResultType.Malicious,
+      );
+      expect(mockCallSecurityAlertResponse.reason).toBe(
+        BlockaidReason.permitFarming,
+      );
+      expect(mockCallSecurityAlertResponse.securityAlertId).toBeDefined();
+      expect(req.securityAlertResponse).toBeDefined();
+    });
   });
 
-  it('should not do validation if user has not enabled preference', async () => {
+  it('does not do validation if the user has not enabled the preference', async () => {
     const usePPOM = async () => Promise.resolve('VALIDATION_RESULT');
-    const middlewareFunction = createMiddleWare(usePPOM, false);
+    const middlewareFunction = createMiddleWare(usePPOM, {
+      securityAlertsEnabled: false,
+    });
     const req = {
+      ...JsonRpcRequestStruct,
       method: 'eth_sendTransaction',
       securityAlertResponse: undefined,
     };
@@ -93,94 +181,124 @@ describe('PPOMMiddleware', () => {
     expect(req.securityAlertResponse).toBeUndefined();
   });
 
-  it('should not do validation if user is not on mainnet', async () => {
+  it('does not do validation if user is not on a supported network', async () => {
     const usePPOM = async () => Promise.resolve('VALIDATION_RESULT');
-    const middlewareFunction = createMiddleWare(usePPOM, false, '0x2');
+    const middlewareFunction = createMiddleWare(usePPOM, {
+      chainId: '0x2',
+    });
     const req = {
+      ...JsonRpcRequestStruct,
       method: 'eth_sendTransaction',
       securityAlertResponse: undefined,
     };
-    await middlewareFunction(req, undefined, () => undefined);
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct },
+      () => undefined,
+    );
     expect(req.securityAlertResponse).toBeUndefined();
   });
 
-  it('should set error type in response if usePPOM throw error', async () => {
+  it('sets error types in the response if usePPOM throws an error', async () => {
     const usePPOM = async () => {
       throw new Error('some error');
     };
-    const middlewareFunction = createMiddleWare({ usePPOM });
+    const mockUpdateSecurityAlertResponseByTxId = jest.fn();
+    const middlewareFunction = createMiddleWare(usePPOM, {
+      mockUpdateSecurityAlertResponseByTxId,
+    });
     const req = {
+      ...JsonRpcRequestStruct,
       method: 'eth_sendTransaction',
-      securityAlertResponse: undefined,
     };
-    await middlewareFunction(req, undefined, () => undefined);
-    expect((req.securityAlertResponse as any)?.result_type).toBe(
-      BlockaidResultType.Errored,
-    );
-    expect((req.securityAlertResponse as any)?.reason).toBe(
-      BlockaidReason.errored,
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct },
+      () => undefined,
     );
+
+    await waitFor(() => {
+      const mockCallSecurityAlertResponse =
+        mockUpdateSecurityAlertResponseByTxId.mock.calls[0][1];
+      expect(mockCallSecurityAlertResponse.description).toBe(
+        'Error: some error',
+      );
+      expect(mockCallSecurityAlertResponse.result_type).toBe(
+        BlockaidResultType.Errored,
+      );
+      expect(mockCallSecurityAlertResponse.result_type).toBe(
+        BlockaidReason.errored,
+      );
+      expect(mockCallSecurityAlertResponse.securityAlertId).toBeDefined();
+    });
   });
 
-  it('should call next method when ppomController.usePPOM completes', async () => {
+  it('calls next method when ppomController.usePPOM completes', async () => {
     const ppom = {
       validateJsonRpc: () => undefined,
     };
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const usePPOM = async (callback: any) => {
       callback(ppom);
     };
     const middlewareFunction = createMiddleWare(usePPOM);
     const nextMock = jest.fn();
     await middlewareFunction(
-      { method: 'eth_sendTransaction' },
-      undefined,
+      { ...JsonRpcRequestStruct, method: 'eth_sendTransaction' },
+      { ...JsonRpcResponseStruct },
       nextMock,
     );
     expect(nextMock).toHaveBeenCalledTimes(1);
   });
 
-  it('should call next method when ppomController.usePPOM throws error', async () => {
+  it('calls next method when ppomController.usePPOM throws error', async () => {
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const usePPOM = async (_callback: any) => {
       throw Error('Some error');
     };
     const middlewareFunction = createMiddleWare(usePPOM);
     const nextMock = jest.fn();
     await middlewareFunction(
-      { method: 'eth_sendTransaction' },
-      undefined,
+      { ...JsonRpcRequestStruct, method: 'eth_sendTransaction' },
+      { ...JsonRpcResponseStruct },
       nextMock,
     );
     expect(nextMock).toHaveBeenCalledTimes(1);
   });
-
-  it('should call ppom.validateJsonRpc when invoked', async () => {
+  it('calls ppom.validateJsonRpc when invoked', async () => {
     const validateMock = jest.fn();
     const ppom = {
       validateJsonRpc: validateMock,
     };
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const usePPOM = async (callback: any) => {
       callback(ppom);
     };
     const middlewareFunction = createMiddleWare(usePPOM);
     await middlewareFunction(
-      { method: 'eth_sendTransaction' },
-      undefined,
+      { ...JsonRpcRequestStruct, method: 'eth_sendTransaction' },
+      { ...JsonRpcResponseStruct },
       () => undefined,
     );
     expect(validateMock).toHaveBeenCalledTimes(1);
   });
 
-  it('should not call ppom.validateJsonRpc when request is not for confirmation method', async () => {
+  it('does not call ppom.validateJsonRpc when request is not for confirmation method', async () => {
     const validateMock = jest.fn();
     const ppom = {
       validateJsonRpc: validateMock,
     };
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const usePPOM = async (callback: any) => {
       callback(ppom);
     };
     const middlewareFunction = createMiddleWare(usePPOM);
     await middlewareFunction(
-      { method: 'eth_someRequest' },
+      { ...JsonRpcRequestStruct, method: 'eth_someRequest' },
       undefined,
       () => undefined,
     );
@@ -189,6 +307,7 @@ describe('PPOMMiddleware', () => {
 
   it('normalizes transaction requests before validation', async () => {
     const requestMock1 = {
+      ...JsonRpcRequestStruct,
       method: 'eth_sendTransaction',
       params: [{ data: '0x1' }],
     };
@@ -206,13 +325,19 @@ describe('PPOMMiddleware', () => {
       validateJsonRpc: validateMock,
     };
 
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const usePPOM = async (callback: any) => {
       callback(ppom);
     };
 
     const middlewareFunction = createMiddleWare(usePPOM);
 
-    await middlewareFunction(requestMock1, undefined, () => undefined);
+    await middlewareFunction(
+      requestMock1,
+      { ...JsonRpcResponseStruct },
+      () => undefined,
+    );
 
     expect(normalizePPOMRequestMock).toHaveBeenCalledTimes(1);
     expect(normalizePPOMRequestMock).toHaveBeenCalledWith(requestMock1);
diff --git a/app/scripts/lib/ppom/ppom-middleware.ts b/app/scripts/lib/ppom/ppom-middleware.ts
index c30c38fa8622..f7763bf7e4a8 100644
--- a/app/scripts/lib/ppom/ppom-middleware.ts
+++ b/app/scripts/lib/ppom/ppom-middleware.ts
@@ -1,6 +1,13 @@
 import { PPOM } from '@blockaid/ppom_release';
 import { PPOMController } from '@metamask/ppom-validator';
 import { NetworkController } from '@metamask/network-controller';
+import {
+  Hex,
+  Json,
+  JsonRpcParams,
+  JsonRpcRequest,
+  JsonRpcResponse,
+} from '@metamask/utils';
 import { v4 as uuid } from 'uuid';
 
 import {
@@ -13,7 +20,7 @@ import { PreferencesController } from '../../controllers/preferences';
 import { SecurityAlertResponse } from '../transaction/util';
 import { normalizePPOMRequest } from './ppom-util';
 
-const { sentry } = global as any;
+const { sentry } = global;
 
 const CONFIRMATION_METHODS = Object.freeze([
   'eth_sendRawTransaction',
@@ -21,13 +28,14 @@ const CONFIRMATION_METHODS = Object.freeze([
   ...SIGNING_METHODS,
 ]);
 
-export const SUPPORTED_CHAIN_IDS: string[] = [
+export const SUPPORTED_CHAIN_IDS: Hex[] = [
   CHAIN_IDS.ARBITRUM,
   CHAIN_IDS.AVALANCHE,
   CHAIN_IDS.BASE,
   CHAIN_IDS.BSC,
   CHAIN_IDS.LINEA_MAINNET,
   CHAIN_IDS.MAINNET,
+  CHAIN_IDS.OPBNB,
   CHAIN_IDS.OPTIMISM,
   CHAIN_IDS.POLYGON,
   CHAIN_IDS.SEPOLIA,
@@ -49,17 +57,30 @@ export const SUPPORTED_CHAIN_IDS: string[] = [
  * @param updateSecurityAlertResponseByTxId
  * @returns PPOMMiddleware function.
  */
-export function createPPOMMiddleware(
+export function createPPOMMiddleware<
+  Params extends JsonRpcParams,
+  Result extends Json,
+>(
   ppomController: PPOMController,
   preferencesController: PreferencesController,
   networkController: NetworkController,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   appStateController: any,
   updateSecurityAlertResponseByTxId: (
-    req: any,
+    req: JsonRpcRequest<JsonRpcParams> & {
+      securityAlertResponse: SecurityAlertResponse;
+    },
     securityAlertResponse: SecurityAlertResponse,
   ) => void,
 ) {
-  return async (req: any, _res: any, next: () => void) => {
+  return async (
+    req: JsonRpcRequest<Params> & {
+      securityAlertResponse: SecurityAlertResponse;
+    },
+    _res: JsonRpcResponse<Result>,
+    next: () => void,
+  ) => {
     try {
       const securityAlertsEnabled =
         preferencesController.store.getState()?.securityAlertsEnabled;
@@ -71,32 +92,59 @@ export function createPPOMMiddleware(
       ) {
         // eslint-disable-next-line require-atomic-updates
         const securityAlertId = uuid();
+        let securityAlertResponse: SecurityAlertResponse = {
+          reason: BlockaidResultType.Loading,
+          result_type: BlockaidReason.inProgress,
+          securityAlertId,
+        };
 
         ppomController
           .usePPOM(async (ppom: PPOM) => {
             try {
               const normalizedRequest = normalizePPOMRequest(req);
 
-              const securityAlertResponse = await ppom.validateJsonRpc(
+              securityAlertResponse = await ppom.validateJsonRpc(
                 normalizedRequest,
               );
-
               securityAlertResponse.securityAlertId = securityAlertId;
-              return securityAlertResponse;
-            } catch (error: any) {
+            } catch (error: unknown) {
               sentry?.captureException(error);
-              const errorObject = error as unknown as Error;
-              console.error('Error validating JSON RPC using PPOM: ', error);
-              const securityAlertResponse = {
+              console.error(
+                'Error validating JSON RPC using PPOM: ',
+                typeof error === 'object' || typeof error === 'string'
+                  ? error
+                  : JSON.stringify(error),
+              );
+
+              securityAlertResponse = {
                 result_type: BlockaidResultType.Errored,
                 reason: BlockaidReason.errored,
-                description: `${errorObject.name}: ${errorObject.message}`,
+                description:
+                  error instanceof Error
+                    ? `${error.name}: ${error.message}`
+                    : JSON.stringify(error),
               };
-
-              return securityAlertResponse;
             }
           })
-          .then((securityAlertResponse) => {
+          .catch((error: unknown) => {
+            sentry?.captureException(error);
+            console.error(
+              'Error createPPOMMiddleware#usePPOM: ',
+              typeof error === 'object' || typeof error === 'string'
+                ? error
+                : JSON.stringify(error),
+            );
+
+            securityAlertResponse = {
+              result_type: BlockaidResultType.Errored,
+              reason: BlockaidReason.errored,
+              description:
+                error instanceof Error
+                  ? `${error.name}: ${error.message}`
+                  : JSON.stringify(error),
+            };
+          })
+          .finally(() => {
             updateSecurityAlertResponseByTxId(req, {
               ...securityAlertResponse,
               securityAlertId,
@@ -104,32 +152,31 @@ export function createPPOMMiddleware(
           });
 
         if (SIGNING_METHODS.includes(req.method)) {
-          req.securityAlertResponse = {
-            reason: BlockaidResultType.Loading,
-            result_type: BlockaidReason.inProgress,
-            securityAlertId,
-          };
           appStateController.addSignatureSecurityAlertResponse({
             reason: BlockaidResultType.Loading,
             result_type: BlockaidReason.inProgress,
             securityAlertId,
           });
-        } else {
-          req.securityAlertResponse = {
-            reason: BlockaidResultType.Loading,
-            result_type: BlockaidReason.inProgress,
-            securityAlertId,
-          };
         }
+
+        req.securityAlertResponse = { ...securityAlertResponse };
       }
-    } catch (error: any) {
-      const errorObject = error as unknown as Error;
+    } catch (error: unknown) {
       sentry?.captureException(error);
-      console.error('Error validating JSON RPC using PPOM: ', error);
+      console.error(
+        'Error createPPOMMiddleware: ',
+        typeof error === 'object' || typeof error === 'string'
+          ? error
+          : JSON.stringify(error),
+      );
+
       req.securityAlertResponse = {
         result_type: BlockaidResultType.Errored,
         reason: BlockaidReason.errored,
-        description: `${errorObject.name}: ${errorObject.message}`,
+        description:
+          error instanceof Error
+            ? `${error.name}: ${error.message}`
+            : JSON.stringify(error),
       };
     } finally {
       next();
diff --git a/app/scripts/lib/ppom/ppom-util.ts b/app/scripts/lib/ppom/ppom-util.ts
index d0f9141996c0..95806d41bb4a 100644
--- a/app/scripts/lib/ppom/ppom-util.ts
+++ b/app/scripts/lib/ppom/ppom-util.ts
@@ -2,6 +2,8 @@ import { normalizeTransactionParams } from '@metamask/transaction-controller';
 
 const METHOD_SEND_TRANSACTION = 'eth_sendTransaction';
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function normalizePPOMRequest(request: any) {
   if (request.method !== METHOD_SEND_TRANSACTION) {
     return request;
diff --git a/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js
index d0653fd6332a..db9cde9ed3e5 100644
--- a/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js
+++ b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js
@@ -1,7 +1,7 @@
 import { permissionRpcMethods } from '@metamask/permission-controller';
 import { selectHooks } from '@metamask/snaps-rpc-methods';
+import { hasProperty } from '@metamask/utils';
 import { ethErrors } from 'eth-rpc-errors';
-import { flatten } from 'lodash';
 import { UNSUPPORTED_RPC_METHODS } from '../../../../shared/constants/network';
 import localHandlers from './handlers';
 
@@ -9,15 +9,13 @@ const allHandlers = [...localHandlers, ...permissionRpcMethods.handlers];
 
 const handlerMap = allHandlers.reduce((map, handler) => {
   for (const methodName of handler.methodNames) {
-    map.set(methodName, handler);
+    map[methodName] = handler;
   }
   return map;
-}, new Map());
+}, {});
 
-const expectedHookNames = Array.from(
-  new Set(
-    flatten(allHandlers.map(({ hookNames }) => Object.keys(hookNames))),
-  ).values(),
+const expectedHookNames = new Set(
+  allHandlers.flatMap(({ hookNames }) => Object.getOwnPropertyNames(hookNames)),
 );
 
 /**
@@ -26,20 +24,12 @@ const expectedHookNames = Array.from(
  * Handlers consume functions that hook into the background, and only depend
  * on their signatures, not e.g. controller internals.
  *
- * @param {Record<string, unknown>} hooks - Required "hooks" into our
+ * @param  {Record<string, (...args: unknown[]) => unknown | Promise<unknown>>} hooks - Required "hooks" into our
  * controllers.
- * @returns {(req: object, res: object, next: Function, end: Function) => void}
+ * @returns {import('json-rpc-engine').JsonRpcMiddleware<unknown, unknown>} The method middleware function.
  */
 export function createMethodMiddleware(hooks) {
-  // Fail immediately if we forgot to provide any expected hooks.
-  const missingHookNames = expectedHookNames.filter(
-    (hookName) => !Object.hasOwnProperty.call(hooks, hookName),
-  );
-  if (missingHookNames.length > 0) {
-    throw new Error(
-      `Missing expected hooks:\n\n${missingHookNames.join('\n')}\n`,
-    );
-  }
+  assertExpectedHook(hooks);
 
   return async function methodMiddleware(req, res, next, end) {
     // Reject unsupported methods.
@@ -47,7 +37,7 @@ export function createMethodMiddleware(hooks) {
       return end(ethErrors.rpc.methodNotSupported());
     }
 
-    const handler = handlerMap.get(req.method);
+    const handler = handlerMap[req.method];
     if (handler) {
       const { implementation, hookNames } = handler;
       try {
@@ -63,10 +53,42 @@ export function createMethodMiddleware(hooks) {
         if (process.env.METAMASK_DEBUG) {
           console.error(error);
         }
-        return end(error);
+        return end(
+          error instanceof Error
+            ? error
+            : ethErrors.rpc.internal({ data: error }),
+        );
       }
     }
 
     return next();
   };
 }
+
+/**
+ * Asserts that the hooks object only has all expected hooks and no extraneous ones.
+ *
+ * @param {Record<string, unknown>} hooks - Required "hooks" into our controllers.
+ */
+function assertExpectedHook(hooks) {
+  const missingHookNames = [];
+  expectedHookNames.forEach((hookName) => {
+    if (!hasProperty(hooks, hookName)) {
+      missingHookNames.push(hookName);
+    }
+  });
+  if (missingHookNames.length > 0) {
+    throw new Error(
+      `Missing expected hooks:\n\n${missingHookNames.join('\n')}\n`,
+    );
+  }
+
+  const extraneousHookNames = Object.getOwnPropertyNames(hooks).filter(
+    (hookName) => !expectedHookNames.has(hookName),
+  );
+  if (extraneousHookNames.length > 0) {
+    throw new Error(
+      `Received unexpected hooks:\n\n${extraneousHookNames.join('\n')}\n`,
+    );
+  }
+}
diff --git a/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.test.js b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.test.js
new file mode 100644
index 000000000000..cb26fc8061de
--- /dev/null
+++ b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.test.js
@@ -0,0 +1,190 @@
+import { JsonRpcEngine } from 'json-rpc-engine';
+import {
+  assertIsJsonRpcFailure,
+  assertIsJsonRpcSuccess,
+} from '@metamask/utils';
+import { createMethodMiddleware } from '.';
+
+jest.mock('@metamask/permission-controller', () => ({
+  permissionRpcMethods: { handlers: [] },
+}));
+
+jest.mock('./handlers', () => [
+  {
+    implementation: (req, res, _next, end, hooks) => {
+      if (Array.isArray(req.params)) {
+        switch (req.params[0]) {
+          case 1:
+            res.result = hooks.hook1();
+            break;
+          case 2:
+            res.result = hooks.hook2();
+            break;
+          case 3:
+            return end(new Error('test error'));
+          case 4:
+            throw new Error('test error');
+          case 5:
+            // eslint-disable-next-line no-throw-literal
+            throw 'foo';
+          default:
+            throw new Error(`unexpected param "${req.params[0]}"`);
+        }
+      }
+      return end();
+    },
+    hookNames: { hook1: true, hook2: true },
+    methodNames: ['method1', 'method2'],
+  },
+]);
+
+describe('createMethodMiddleware', () => {
+  const method1 = 'method1';
+
+  const getDefaultHooks = () => ({
+    hook1: () => 42,
+    hook2: () => 99,
+  });
+
+  it('should return a function', () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    expect(typeof middleware).toBe('function');
+  });
+
+  it('should throw an error if a required hook is missing', () => {
+    const hooks = { hook1: () => 42 };
+
+    // @ts-expect-error Intentional destructive testing
+    expect(() => createMethodMiddleware(hooks)).toThrow(
+      'Missing expected hooks',
+    );
+  });
+
+  it('should throw an error if an extraneous hook is provided', () => {
+    const hooks = {
+      ...getDefaultHooks(),
+      extraneousHook: () => 100,
+    };
+
+    expect(() => createMethodMiddleware(hooks)).toThrow(
+      'Received unexpected hooks',
+    );
+  });
+
+  it('should call the handler for the matching method (uses hook1)', async () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    const engine = new JsonRpcEngine();
+    engine.push(middleware);
+
+    const response = await engine.handle({
+      jsonrpc: '2.0',
+      id: 1,
+      method: method1,
+      params: [1],
+    });
+    assertIsJsonRpcSuccess(response);
+
+    expect(response.result).toBe(42);
+  });
+
+  it('should call the handler for the matching method (uses hook2)', async () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    const engine = new JsonRpcEngine();
+    engine.push(middleware);
+
+    const response = await engine.handle({
+      jsonrpc: '2.0',
+      id: 1,
+      method: method1,
+      params: [2],
+    });
+    assertIsJsonRpcSuccess(response);
+
+    expect(response.result).toBe(99);
+  });
+
+  it('should not call the handler for a non-matching method', async () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    const engine = new JsonRpcEngine();
+    engine.push(middleware);
+
+    const response = await engine.handle({
+      jsonrpc: '2.0',
+      id: 1,
+      method: 'nonMatchingMethod',
+    });
+    assertIsJsonRpcFailure(response);
+
+    expect(response.error).toMatchObject({
+      message: expect.stringMatching(
+        /Response has no error or result for request/u,
+      ),
+    });
+  });
+
+  it('should reject unsupported methods', async () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    const engine = new JsonRpcEngine();
+    engine.push(middleware);
+
+    const response = await engine.handle({
+      jsonrpc: '2.0',
+      id: 1,
+      method: 'eth_signTransaction',
+    });
+    assertIsJsonRpcFailure(response);
+
+    expect(response.error.message).toBe('Method not supported.');
+  });
+
+  it('should handle errors returned by the implementation', async () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    const engine = new JsonRpcEngine();
+    engine.push(middleware);
+
+    const response = await engine.handle({
+      jsonrpc: '2.0',
+      id: 1,
+      method: method1,
+      params: [3],
+    });
+    assertIsJsonRpcFailure(response);
+
+    expect(response.error.message).toBe('test error');
+  });
+
+  it('should handle errors thrown by the implementation', async () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    const engine = new JsonRpcEngine();
+    engine.push(middleware);
+
+    const response = await engine.handle({
+      jsonrpc: '2.0',
+      id: 1,
+      method: method1,
+      params: [4],
+    });
+    assertIsJsonRpcFailure(response);
+
+    expect(response.error.message).toBe('test error');
+  });
+
+  it('should handle non-errors thrown by the implementation', async () => {
+    const middleware = createMethodMiddleware(getDefaultHooks());
+    const engine = new JsonRpcEngine();
+    engine.push(middleware);
+
+    const response = await engine.handle({
+      jsonrpc: '2.0',
+      id: 1,
+      method: method1,
+      params: [5],
+    });
+    assertIsJsonRpcFailure(response);
+
+    expect(response.error).toMatchObject({
+      message: 'Internal JSON-RPC error.',
+      data: 'foo',
+    });
+  });
+});
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/index.js b/app/scripts/lib/rpc-method-middleware/handlers/index.ts
similarity index 99%
rename from app/scripts/lib/rpc-method-middleware/handlers/index.js
rename to app/scripts/lib/rpc-method-middleware/handlers/index.ts
index 4474b4f8da75..0c4e7acbb4c8 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/index.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/index.ts
@@ -34,4 +34,5 @@ const handlers = [
   mmiOpenAddHardwareWallet,
   ///: END:ONLY_INCLUDE_IF
 ];
+
 export default handlers;
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js b/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js
index 0a73b5e0519a..f90fb5bd0d42 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js
@@ -4,6 +4,7 @@ import {
   MetaMetricsEventName,
   MetaMetricsEventCategory,
 } from '../../../../../shared/constants/metametrics';
+import { shouldEmitDappViewedEvent } from '../../util';
 
 /**
  * This method attempts to retrieve the Ethereum accounts available to the
@@ -114,18 +115,20 @@ async function requestEthereumAccountsHandler(
     const isFirstVisit = !Object.keys(metamaskState.permissionHistory).includes(
       origin,
     );
-    sendMetrics({
-      event: MetaMetricsEventName.DappViewed,
-      category: MetaMetricsEventCategory.InpageProvider,
-      referrer: {
-        url: origin,
-      },
-      properties: {
-        is_first_visit: isFirstVisit,
-        number_of_accounts: Object.keys(metamaskState.accounts).length,
-        number_of_accounts_connected: numberOfConnectedAccounts,
-      },
-    });
+    if (shouldEmitDappViewedEvent(metamaskState.metaMetricsId)) {
+      sendMetrics({
+        event: MetaMetricsEventName.DappViewed,
+        category: MetaMetricsEventCategory.InpageProvider,
+        referrer: {
+          url: origin,
+        },
+        properties: {
+          is_first_visit: isFirstVisit,
+          number_of_accounts: Object.keys(metamaskState.accounts).length,
+          number_of_accounts_connected: numberOfConnectedAccounts,
+        },
+      });
+    }
   } else {
     // This should never happen, because it should be caught in the
     // above catch clause
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index b03a15a45dd3..afcecd02cb5f 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -86,6 +86,7 @@ export const SENTRY_BACKGROUND_STATE = {
     browserEnvironment: true,
     connectedStatusPopoverHasBeenShown: true,
     currentPopupId: false,
+    currentExtensionPopupId: false,
     defaultHomeActiveTabName: true,
     fullScreenGasPollTokens: true,
     hadAdvancedGasFeesSetPriorToMigration92_3: true,
@@ -99,9 +100,10 @@ export const SENTRY_BACKGROUND_STATE = {
     recoveryPhraseReminderLastShown: true,
     showBetaHeader: true,
     showPermissionsTour: true,
-    showProductTour: true,
     showNetworkBanner: true,
     showAccountBanner: true,
+    switchedNetworkDetails: false,
+    switchedNetworkNeverShowMessage: false,
     showTestnetMessageInDropdown: true,
     surveyLinkLastClickedOrClosed: true,
     snapsInstallPrivacyWarningShown: true,
@@ -134,6 +136,7 @@ export const SENTRY_BACKGROUND_STATE = {
     gasEstimateType: true,
     gasFeeEstimates: true,
     gasFeeEstimatesByChainId: true,
+    nonRPCGasFeeApisDisabled: false,
   },
   KeyringController: {
     isUnlocked: true,
@@ -219,9 +222,11 @@ export const SENTRY_BACKGROUND_STATE = {
       showExtensionInFullSizeView: true,
       showFiatInTestnets: true,
       showTestNetworks: true,
+      smartTransactionsOptInStatus: true,
       useNativeCurrencyAsPrimaryCurrency: true,
       petnamesEnabled: true,
     },
+    useExternalServices: false,
     selectedAddress: false,
     snapRegistryList: false,
     theme: true,
@@ -237,6 +242,7 @@ export const SENTRY_BACKGROUND_STATE = {
     useTokenDetection: true,
     useRequestQueue: true,
     useTransactionSimulations: true,
+    enableMV3TimestampSave: true,
     hasDismissedOpenSeaToBlockaidBanner: true,
   },
   SelectedNetworkController: { domains: false },
@@ -381,6 +387,8 @@ export const SENTRY_UI_STATE = {
     addSnapAccountEnabled: false,
     snapsAddSnapAccountModalDismissed: false,
     ///: END:ONLY_INCLUDE_IF
+    switchedNetworkDetails: false,
+    switchedNetworkNeverShowMessage: false,
   },
   unconnectedAccount: true,
 };
@@ -475,10 +483,18 @@ export default function setupSentry({ release, getState }) {
         `Missing SENTRY_DSN environment variable in production environment`,
       );
     }
+
+    ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+    sentryTarget = process.env.SENTRY_MMI_DSN;
+    ///: END:ONLY_INCLUDE_IF
+
+    ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+    sentryTarget = process.env.SENTRY_DSN;
+    ///: END:ONLY_INCLUDE_IF
+
     console.log(
       `Setting up Sentry Remote Error Reporting for '${environment}': SENTRY_DSN`,
     );
-    sentryTarget = process.env.SENTRY_DSN;
   } else {
     console.log(
       `Setting up Sentry Remote Error Reporting for '${environment}': SENTRY_DSN_DEV`,
@@ -493,6 +509,10 @@ export default function setupSentry({ release, getState }) {
    * @returns `true` if MetaMetrics is enabled, `false` otherwise.
    */
   async function getMetaMetricsEnabled() {
+    if (METAMASK_BUILD_TYPE === 'mmi') {
+      return true;
+    }
+
     const appState = getState();
     if (appState.state || appState.persistedState) {
       return getMetaMetricsEnabledFromAppState(appState);
@@ -508,6 +528,22 @@ export default function setupSentry({ release, getState }) {
     }
   }
 
+  /**
+   * Returns whether Sentry should be enabled or not. If the build type is mmi
+   * it will always be enabled, if it's main it will first check for MetaMetrics
+   * value before returning true or false
+   *
+   * @returns `true` if Sentry should be enabled, depends on the build type and
+   * whether MetaMetrics is on or off for all build types except mmi
+   */
+  async function getSentryEnabled() {
+    // For MMI we want Sentry always logging, doesn't depend on MetaMetrics being on or off
+    if (METAMASK_BUILD_TYPE === 'mmi') {
+      return true;
+    }
+    return getMetaMetricsEnabled();
+  }
+
   Sentry.init({
     dsn: sentryTarget,
     debug: METAMASK_DEBUG,
@@ -567,7 +603,7 @@ export default function setupSentry({ release, getState }) {
   const startSession = async () => {
     const hub = Sentry.getCurrentHub?.();
     const options = hub.getClient?.().getOptions?.() ?? {};
-    if (hub && (await getMetaMetricsEnabled()) === true) {
+    if (hub && (await getSentryEnabled()) === true) {
       options.autoSessionTracking = true;
       hub.startSession();
     }
@@ -581,7 +617,7 @@ export default function setupSentry({ release, getState }) {
   const endSession = async () => {
     const hub = Sentry.getCurrentHub?.();
     const options = hub.getClient?.().getOptions?.() ?? {};
-    if (hub && (await getMetaMetricsEnabled()) === false) {
+    if (hub && (await getSentryEnabled()) === false) {
       options.autoSessionTracking = false;
       hub.endSession();
     }
@@ -597,14 +633,11 @@ export default function setupSentry({ release, getState }) {
     const options = hub.getClient?.().getOptions?.() ?? {
       autoSessionTracking: false,
     };
-    const isMetaMetricsEnabled = await getMetaMetricsEnabled();
-    if (
-      isMetaMetricsEnabled === true &&
-      options.autoSessionTracking === false
-    ) {
+    const isSentryEnabled = await getSentryEnabled();
+    if (isSentryEnabled === true && options.autoSessionTracking === false) {
       await startSession();
     } else if (
-      isMetaMetricsEnabled === false &&
+      isSentryEnabled === false &&
       options.autoSessionTracking === true
     ) {
       await endSession();
diff --git a/app/scripts/lib/snap-keyring/metrics.test.ts b/app/scripts/lib/snap-keyring/metrics.test.ts
index e0ef57fc2b59..fe49b2be73e4 100644
--- a/app/scripts/lib/snap-keyring/metrics.test.ts
+++ b/app/scripts/lib/snap-keyring/metrics.test.ts
@@ -3,6 +3,8 @@ import { getSnapAndHardwareInfoForMetrics } from './metrics';
 describe('getSnapAndHardwareInfoForMetrics', () => {
   let getAccountType: jest.Mock;
   let getDeviceModel: jest.Mock;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let messenger: any;
 
   beforeEach(() => {
diff --git a/app/scripts/lib/snap-keyring/snap-keyring.ts b/app/scripts/lib/snap-keyring/snap-keyring.ts
index 17683dee0a52..62b61c8ed335 100644
--- a/app/scripts/lib/snap-keyring/snap-keyring.ts
+++ b/app/scripts/lib/snap-keyring/snap-keyring.ts
@@ -51,14 +51,22 @@ export const snapKeyringBuilder = (
   getSnapController: () => SnapController,
   persistKeyringHelper: () => Promise<void>,
   setSelectedAccountHelper: (address: string) => void,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   removeAccountHelper: (address: string) => Promise<any>,
   trackEvent: (
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     payload: Record<string, any>,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     options?: Record<string, any>,
   ) => void,
   getSnapName: (snapId: string) => string,
 ) => {
   const builder = (() => {
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return new SnapKeyring(getSnapController() as any, {
       addressExists: async (address) => {
         const addresses = await controllerMessenger.call(
@@ -348,6 +356,8 @@ export const snapKeyringBuilder = (
         }
       },
     });
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   }) as any;
   builder.type = SnapKeyring.type;
   return builder;
diff --git a/app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts b/app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts
index 839176dca5a1..3a493b764b35 100644
--- a/app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts
+++ b/app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts
@@ -8,6 +8,9 @@ describe('isBlockedUrl', () => {
     name: 'PhishingController',
   });
   const phishingController = new PhishingController({
+    // @ts-expect-error The PhishingController uses a newer verison of the package
+    // `@metamask/base-controller`, which has a different messenger type. This error will be
+    // resolved shortly when the `@metamask/base-controller` package is updated.
     messenger: phishingControllerMessenger,
     state: {
       phishingLists: [
@@ -36,6 +39,8 @@ describe('isBlockedUrl', () => {
     [1, true],
     [0, true],
     [-1, true],
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ])('"%s" is blocked: %s', async (url: any, expected: boolean) => {
     const result = await isBlockedUrl(
       url,
diff --git a/app/scripts/lib/snap-keyring/utils/showResult.ts b/app/scripts/lib/snap-keyring/utils/showResult.ts
index c0b4c530ed09..086f9fe07174 100644
--- a/app/scripts/lib/snap-keyring/utils/showResult.ts
+++ b/app/scripts/lib/snap-keyring/utils/showResult.ts
@@ -42,6 +42,8 @@ export const showError = (
   controllerMessenger: SnapKeyringBuilderMessenger,
   snapId: string,
   opts: ResultComponentOptions,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   properties: Record<string, any>,
 ): Promise<ErrorResult> => {
   return controllerMessenger.call('ApprovalController:showError', {
@@ -70,6 +72,8 @@ export const showSuccess = (
   controllerMessenger: SnapKeyringBuilderMessenger,
   snapId: string,
   opts: ResultComponentOptions,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   properties: Record<string, any>,
 ): Promise<ErrorResult> => {
   return controllerMessenger.call('ApprovalController:showSuccess', {
diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts
index a4eb13918d7d..74d5aaa13ca0 100644
--- a/app/scripts/lib/transaction/metrics.test.ts
+++ b/app/scripts/lib/transaction/metrics.test.ts
@@ -68,8 +68,12 @@ const mockTransactionMetricsRequest = {
   getTokenStandardAndDetails: jest.fn(),
   getTransaction: jest.fn(),
   provider: provider as Provider,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   snapAndHardwareMessenger: jest.fn() as any,
   trackEvent: jest.fn(),
+  getIsSmartTransaction: jest.fn(),
+  getSmartTransactionByMinedTxHash: jest.fn(),
 } as TransactionMetricsRequest;
 
 describe('Transaction metrics', () => {
@@ -77,9 +81,17 @@ describe('Transaction metrics', () => {
     mockChainId,
     mockNetworkId,
     mockTransactionMeta: TransactionMeta,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     mockTransactionMetaWithBlockaid: any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     expectedProperties: any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     expectedSensitiveProperties: any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     mockActionId: any;
 
   beforeEach(() => {
@@ -160,6 +172,8 @@ describe('Transaction metrics', () => {
 
   describe('handleTransactionAdded', () => {
     it('should return if transaction meta is not defined', async () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       await handleTransactionAdded(mockTransactionMetricsRequest, {} as any);
       expect(
         mockTransactionMetricsRequest.createEventFragment,
@@ -168,6 +182,8 @@ describe('Transaction metrics', () => {
 
     it('should create event fragment', async () => {
       await handleTransactionAdded(mockTransactionMetricsRequest, {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         transactionMeta: mockTransactionMeta as any,
         actionId: mockActionId,
       });
@@ -195,6 +211,8 @@ describe('Transaction metrics', () => {
       };
 
       await handleTransactionAdded(mockTransactionMetricsRequest, {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         transactionMeta: mockTransactionMeta as any,
         actionId: mockActionId,
       });
@@ -221,6 +239,8 @@ describe('Transaction metrics', () => {
 
     it('should create event fragment with blockaid', async () => {
       await handleTransactionAdded(mockTransactionMetricsRequest, {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         transactionMeta: mockTransactionMetaWithBlockaid as any,
         actionId: mockActionId,
       });
@@ -251,6 +271,8 @@ describe('Transaction metrics', () => {
 
   describe('handleTransactionApproved', () => {
     it('should return if transaction meta is not defined', async () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       await handleTransactionApproved(mockTransactionMetricsRequest, {} as any);
       expect(
         mockTransactionMetricsRequest.createEventFragment,
@@ -265,6 +287,8 @@ describe('Transaction metrics', () => {
 
     it('should create, update, finalize event fragment', async () => {
       await handleTransactionApproved(mockTransactionMetricsRequest, {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         transactionMeta: mockTransactionMeta as any,
         actionId: mockActionId,
       });
@@ -306,6 +330,8 @@ describe('Transaction metrics', () => {
 
     it('should create, update, finalize event fragment with blockaid', async () => {
       await handleTransactionApproved(mockTransactionMetricsRequest, {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         transactionMeta: mockTransactionMetaWithBlockaid as any,
         actionId: mockActionId,
       });
@@ -362,6 +388,8 @@ describe('Transaction metrics', () => {
 
   describe('handleTransactionFailed', () => {
     it('should return if transaction meta is not defined', async () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       await handleTransactionFailed(mockTransactionMetricsRequest, {} as any);
       expect(
         mockTransactionMetricsRequest.createEventFragment,
@@ -386,6 +414,8 @@ describe('Transaction metrics', () => {
         transactionMeta: mockTransactionMeta,
         actionId: mockActionId,
         error: mockErrorMessage,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-submitted-1';
@@ -440,6 +470,8 @@ describe('Transaction metrics', () => {
         transactionMeta: mockTransactionMetaWithBlockaid,
         actionId: mockActionId,
         error: mockErrorMessage,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-submitted-1';
@@ -503,6 +535,8 @@ describe('Transaction metrics', () => {
         transactionMeta: mockTransactionMeta,
         actionId: mockActionId,
         error: mockErrorMessage,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-submitted-1';
@@ -550,6 +584,8 @@ describe('Transaction metrics', () => {
     it('should return if transaction meta is not defined', async () => {
       await handleTransactionConfirmed(
         mockTransactionMetricsRequest,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         {} as any,
       );
       expect(
@@ -571,8 +607,10 @@ describe('Transaction metrics', () => {
       mockTransactionMeta.submittedTime = 123;
 
       await handleTransactionConfirmed(mockTransactionMetricsRequest, {
-        transactionMeta: mockTransactionMeta,
+        ...mockTransactionMeta,
         actionId: mockActionId,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-submitted-1';
@@ -627,8 +665,10 @@ describe('Transaction metrics', () => {
       mockTransactionMetaWithBlockaid.submittedTime = 123;
 
       await handleTransactionConfirmed(mockTransactionMetricsRequest, {
-        transactionMeta: mockTransactionMetaWithBlockaid,
+        ...mockTransactionMetaWithBlockaid,
         actionId: mockActionId,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-submitted-1';
@@ -692,6 +732,8 @@ describe('Transaction metrics', () => {
 
   describe('handleTransactionDropped', () => {
     it('should return if transaction meta is not defined', async () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       await handleTransactionDropped(mockTransactionMetricsRequest, {} as any);
       expect(
         mockTransactionMetricsRequest.createEventFragment,
@@ -708,6 +750,8 @@ describe('Transaction metrics', () => {
       await handleTransactionDropped(mockTransactionMetricsRequest, {
         transactionMeta: mockTransactionMeta,
         actionId: mockActionId,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-submitted-1';
@@ -756,6 +800,8 @@ describe('Transaction metrics', () => {
       await handleTransactionDropped(mockTransactionMetricsRequest, {
         transactionMeta: mockTransactionMetaWithBlockaid,
         actionId: mockActionId,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-submitted-1';
@@ -817,6 +863,8 @@ describe('Transaction metrics', () => {
 
   describe('handleTransactionRejected', () => {
     it('should return if transaction meta is not defined', async () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       await handleTransactionRejected(mockTransactionMetricsRequest, {} as any);
       expect(
         mockTransactionMetricsRequest.createEventFragment,
@@ -833,6 +881,8 @@ describe('Transaction metrics', () => {
       await handleTransactionRejected(mockTransactionMetricsRequest, {
         transactionMeta: mockTransactionMeta,
         actionId: mockActionId,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-added-1';
@@ -876,6 +926,8 @@ describe('Transaction metrics', () => {
       await handleTransactionRejected(mockTransactionMetricsRequest, {
         transactionMeta: mockTransactionMetaWithBlockaid,
         actionId: mockActionId,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const expectedUniqueId = 'transaction-added-1';
@@ -934,6 +986,8 @@ describe('Transaction metrics', () => {
     it('should return if transaction meta is not defined', async () => {
       await handleTransactionSubmitted(
         mockTransactionMetricsRequest,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         {} as any,
       );
       expect(
@@ -943,6 +997,8 @@ describe('Transaction metrics', () => {
 
     it('should only create event fragment', async () => {
       await handleTransactionSubmitted(mockTransactionMetricsRequest, {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         transactionMeta: mockTransactionMeta as any,
         actionId: mockActionId,
       });
diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index 1335878393a9..667643bd8408 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -7,6 +7,7 @@ import {
   TransactionMeta,
   TransactionType,
 } from '@metamask/transaction-controller';
+import { SmartTransaction } from '@metamask/smart-transactions-controller/dist/types';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
 import {
   determineTransactionAssetType,
@@ -38,6 +39,7 @@ import {
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 import { getBlockaidMetricsProps } from '../../../../ui/helpers/utils/metrics';
 ///: END:ONLY_INCLUDE_IF
+import { getSmartTransactionMetricsProperties } from '../../../../shared/modules/metametrics';
 import {
   getSnapAndHardwareInfoForMetrics,
   type SnapAndHardwareMessenger,
@@ -69,6 +71,8 @@ export type TransactionMetricsRequest = {
   // According to the type GasFeeState returned from getEIP1559GasFeeEstimates
   // doesn't include some properties used in buildEventFragmentProperties,
   // hence returning any here to avoid type errors.
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getEIP1559GasFeeEstimates(options?: FetchGasFeeEstimateOptions): Promise<any>;
   getParticipateInMetrics: () => boolean;
   getSelectedAddress: () => string;
@@ -81,7 +85,13 @@ export type TransactionMetricsRequest = {
   getTransaction: (transactionId: string) => TransactionMeta;
   provider: Provider;
   snapAndHardwareMessenger: SnapAndHardwareMessenger;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   trackEvent: (payload: any) => void;
+  getIsSmartTransaction: () => boolean;
+  getSmartTransactionByMinedTxHash: (
+    txhash: string | undefined,
+  ) => SmartTransaction;
 };
 
 export const METRICS_STATUS_FAILED = 'failed on-chain';
@@ -92,6 +102,11 @@ export type TransactionEventPayload = {
   error?: string;
 };
 
+export type TransactionMetaEventPayload = TransactionMeta & {
+  actionId?: string;
+  error?: string;
+};
+
 /**
  * This function is called when a transaction is added to the controller.
  *
@@ -161,6 +176,8 @@ export const handleTransactionFailed = async (
     return;
   }
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const extraParams = {} as Record<string, any>;
   if (transactionEventPayload.error) {
     // This is a failed transaction
@@ -185,14 +202,16 @@ export const handleTransactionFailed = async (
  */
 export const handleTransactionConfirmed = async (
   transactionMetricsRequest: TransactionMetricsRequest,
-  transactionEventPayload: TransactionEventPayload,
+  transactionEventPayload: TransactionMetaEventPayload,
 ) => {
-  if (!transactionEventPayload.transactionMeta) {
+  if (Object.keys(transactionEventPayload).length === 0) {
     return;
   }
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const extraParams = {} as Record<string, any>;
-  const { transactionMeta } = transactionEventPayload;
+  const transactionMeta = { ...transactionEventPayload };
   const { txReceipt } = transactionMeta;
 
   extraParams.gas_used = txReceipt?.gasUsed;
@@ -209,7 +228,10 @@ export const handleTransactionConfirmed = async (
   await createUpdateFinalizeTransactionEventFragment({
     eventName: TransactionMetaMetricsEvent.finalized,
     extraParams,
-    transactionEventPayload,
+    transactionEventPayload: {
+      actionId: transactionMeta.actionId,
+      transactionMeta,
+    },
     transactionMetricsRequest,
   });
 };
@@ -484,6 +506,8 @@ function createTransactionEventFragment({
   eventName: TransactionMetaMetricsEvent;
   transactionEventPayload: TransactionEventPayload;
   transactionMetricsRequest: TransactionMetricsRequest;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   payload: any;
 }) {
   if (
@@ -597,6 +621,8 @@ function updateTransactionEventFragment({
   eventName: TransactionMetaMetricsEvent;
   transactionEventPayload: TransactionEventPayload;
   transactionMetricsRequest: TransactionMetricsRequest;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   payload: any;
 }) {
   const uniqueId = getUniqueId(eventName, transactionMeta.id);
@@ -666,6 +692,8 @@ async function createUpdateFinalizeTransactionEventFragment({
   eventName: TransactionMetaMetricsEvent;
   transactionEventPayload: TransactionEventPayload;
   transactionMetricsRequest: TransactionMetricsRequest;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   extraParams?: Record<string, any>;
 }) {
   const { properties, sensitiveProperties } =
@@ -703,6 +731,8 @@ async function createUpdateFinalizeTransactionEventFragment({
 }
 
 function hasFragment(
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getEventFragmentById: (arg0: string) => any,
   eventName: TransactionMetaMetricsEvent,
   transactionMeta: TransactionMeta,
@@ -731,6 +761,8 @@ async function buildEventFragmentProperties({
   transactionMetricsRequest,
   extraParams = {},
 }: {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   extraParams?: Record<string, any>;
   transactionEventPayload: TransactionEventPayload;
   transactionMetricsRequest: TransactionMetricsRequest;
@@ -770,6 +802,8 @@ async function buildEventFragmentProperties({
     transactionMetricsRequest.getTokenStandardAndDetails,
   );
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const gasParams = {} as Record<string, any>;
 
   if (isEIP1559Transaction(transactionMeta)) {
@@ -849,7 +883,6 @@ async function buildEventFragmentProperties({
       TransactionType.tokenMethodSetApprovalForAll,
       TransactionType.tokenMethodTransfer,
       TransactionType.tokenMethodTransferFrom,
-      TransactionType.smart,
       TransactionType.swap,
       TransactionType.swapApproval,
     ].includes(type);
@@ -935,6 +968,8 @@ async function buildEventFragmentProperties({
   }
 
   ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const blockaidProperties: any = getBlockaidMetricsProps(transactionMeta);
 
   if (blockaidProperties?.ui_customizations?.length > 0) {
@@ -946,6 +981,12 @@ async function buildEventFragmentProperties({
     uiCustomizations.push(MetaMetricsEventUiCustomization.GasEstimationFailed);
   }
 
+  const smartTransactionMetricsProperties =
+    getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      transactionMeta,
+    );
+
   /** The transaction status property is not considered sensitive and is now included in the non-anonymous event */
   let properties = {
     chain_id: chainId,
@@ -972,6 +1013,9 @@ async function buildEventFragmentProperties({
     ///: END:ONLY_INCLUDE_IF
     // ui_customizations must come after ...blockaidProperties
     ui_customizations: uiCustomizations.length > 0 ? uiCustomizations : null,
+    ...smartTransactionMetricsProperties,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as Record<string, any>;
 
   const snapAndHardwareInfo = await getSnapAndHardwareInfoForMetrics(
@@ -998,6 +1042,8 @@ async function buildEventFragmentProperties({
     transaction_replaced: transactionReplaced,
     ...extraParams,
     ...gasParamsInGwei,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as Record<string, any>;
 
   if (transactionContractMethod === contractMethodNames.APPROVE) {
@@ -1013,7 +1059,11 @@ async function buildEventFragmentProperties({
   return { properties, sensitiveProperties };
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getGasValuesInGWEI(gasParams: Record<string, any>) {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const gasValuesInGwei = {} as Record<string, any>;
   for (const param in gasParams) {
     if (isHexString(gasParams[param])) {
diff --git a/app/scripts/lib/transaction/mmi-hooks.test.ts b/app/scripts/lib/transaction/mmi-hooks.test.ts
index 210c3093ada8..fee5dff83de5 100644
--- a/app/scripts/lib/transaction/mmi-hooks.test.ts
+++ b/app/scripts/lib/transaction/mmi-hooks.test.ts
@@ -13,6 +13,8 @@ describe('MMI hooks', () => {
   const custodyIdMocked = '123';
   describe('afterTransactionSign', () => {
     it('returns false if txMeta has no custodyStatus', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { to: toMocked } as any;
       const signedEthTx = {};
       const result = afterTransactionSign(txMeta, signedEthTx, jest.fn());
@@ -24,6 +26,8 @@ describe('MMI hooks', () => {
         custodyStatus: TransactionStatus.approved,
         custodyId: custodyIdMocked,
         txParams: { from: fromMocked },
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any;
       const signedEthTx = {
         custodian_transactionId: custodyIdMocked,
@@ -47,12 +51,16 @@ describe('MMI hooks', () => {
 
   describe('beforeTransactionPublish', () => {
     it('returns true if txMeta has custodyStatus', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { custodyStatus: TransactionStatus.approved } as any;
       const result = beforeTransactionPublish(txMeta);
       expect(result).toBe(false);
     });
 
     it('returns false if txMeta has no custodyStatus', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { to: toMocked } as any;
       const result = beforeTransactionPublish(txMeta);
       expect(result).toBe(true);
@@ -61,12 +69,16 @@ describe('MMI hooks', () => {
 
   describe('getAdditionalSignArguments', () => {
     it('returns an array with txMeta when custodyStatus is truthy', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { custodyStatus: TransactionStatus.approved } as any;
       const result = getAdditionalSignArguments(txMeta);
       expect(result).toEqual([txMeta]);
     });
 
     it('returns an empty array when custodyStatus is falsy', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { to: toMocked } as any;
       const result = getAdditionalSignArguments(txMeta);
       expect(result).toEqual([]);
@@ -75,12 +87,16 @@ describe('MMI hooks', () => {
 
   describe('beforeTransactionApproveOnInit', () => {
     it('returns true if txMeta has custodyStatus', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { custodyStatus: TransactionStatus.approved } as any;
       const result = beforeTransactionApproveOnInit(txMeta);
       expect(result).toBe(false);
     });
 
     it('returns false if txMeta has no custodyStatus', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { to: toMocked } as any;
       const result = beforeTransactionApproveOnInit(txMeta);
       expect(result).toBe(true);
@@ -92,12 +108,16 @@ describe('MMI hooks', () => {
       const txMeta = {
         custodyStatus: TransactionStatus.approved,
         custodyId: 1,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any;
       const result = beforeCheckPendingTransaction(txMeta);
       expect(result).toBe(false);
     });
 
     it('returns false if txMeta has no custodyStatus', () => {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const txMeta = { to: toMocked } as any;
       const result = beforeCheckPendingTransaction(txMeta);
       expect(result).toBe(true);
diff --git a/app/scripts/lib/transaction/mmi-hooks.ts b/app/scripts/lib/transaction/mmi-hooks.ts
index 92ea0cf792b9..d4dc3cc4dcda 100644
--- a/app/scripts/lib/transaction/mmi-hooks.ts
+++ b/app/scripts/lib/transaction/mmi-hooks.ts
@@ -9,6 +9,8 @@ import { TransactionMeta } from '@metamask/transaction-controller';
  */
 export function afterTransactionSign(
   txMeta: TransactionMeta,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   signedEthTx: any,
   addTransactionToWatchList: (
     custodianTransactionId: string | undefined,
diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts
new file mode 100644
index 000000000000..507ab83ecdf2
--- /dev/null
+++ b/app/scripts/lib/transaction/smart-transactions.test.ts
@@ -0,0 +1,365 @@
+import EventEmitter from 'events';
+import {
+  TransactionType,
+  TransactionStatus,
+  TransactionController,
+} from '@metamask/transaction-controller';
+import SmartTransactionsController from '@metamask/smart-transactions-controller';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { submitSmartTransactionHook } from './smart-transactions';
+import type {
+  SubmitSmartTransactionRequest,
+  SmartTransactionsControllerMessenger,
+} from './smart-transactions';
+
+const addressFrom = '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e';
+const txHash =
+  '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356';
+const uuid = 'uuid';
+const txId = '1';
+
+let addRequestCallback: () => void;
+
+type SubmitSmartTransactionRequestMocked = SubmitSmartTransactionRequest & {
+  smartTransactionsController: jest.Mocked<SmartTransactionsController>;
+  transactionController: jest.Mocked<TransactionController>;
+};
+
+const createSignedTransaction = () => {
+  return '0xf86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a02b79f322a625d623a2bb2911e0c6b3e7eaf741a7c7c5d2e8c67ef3ff4acf146ca01ae168fea63dc3391b75b586c8a7c0cb55cdf3b8e2e4d8e097957a3a56c6f2c5';
+};
+
+const createTransactionControllerMock = () => {
+  return {
+    approveTransactionsWithSameNonce: jest.fn((transactions = []) => {
+      return transactions.length === 0 ? [] : [createSignedTransaction()];
+    }),
+    state: { transactions: [] },
+  } as unknown as jest.Mocked<TransactionController>;
+};
+
+const createSmartTransactionsControllerMessengerMock = () => {
+  return {
+    call: jest.fn((type) => {
+      if (type === 'ApprovalController:addRequest') {
+        return {
+          then: (callback: () => void) => {
+            addRequestCallback = callback;
+          },
+        };
+      }
+      return Promise.resolve({ id: 'approvalId' });
+    }),
+  } as unknown as jest.Mocked<SmartTransactionsControllerMessenger>;
+};
+
+const createSmartTransactionsControllerMock = () => {
+  return {
+    getFees: jest.fn(async () => {
+      return {
+        tradeTxFees: {
+          cancelFees: [],
+          feeEstimate: 42000000000000,
+          fees: [
+            { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
+          ],
+          gasLimit: 21000,
+          gasUsed: 21000,
+        },
+      };
+    }),
+    submitSignedTransactions: jest.fn(async () => {
+      return {
+        uuid,
+        txHash,
+      };
+    }),
+    eventEmitter: new EventEmitter(),
+  } as unknown as jest.Mocked<SmartTransactionsController>;
+};
+
+describe('submitSmartTransactionHook', () => {
+  const createRequest = () => {
+    return {
+      transactionMeta: {
+        hash: txHash,
+        status: TransactionStatus.signed,
+        id: '1',
+        txParams: {
+          from: addressFrom,
+          to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
+          gasPrice: '0x77359400',
+          gas: '0x7b0d',
+          nonce: '0x4b',
+        },
+        type: TransactionType.simpleSend,
+        chainId: CHAIN_IDS.MAINNET,
+        time: 1624408066355,
+        defaultGasEstimates: {
+          gas: '0x7b0d',
+          gasPrice: '0x77359400',
+        },
+        error: {
+          name: 'Error',
+          message: 'Details of the error',
+        },
+        securityProviderResponse: {
+          flagAsDangerous: 0,
+        },
+      },
+      smartTransactionsController: createSmartTransactionsControllerMock(),
+      transactionController: createTransactionControllerMock(),
+      isSmartTransaction: true,
+      controllerMessenger: createSmartTransactionsControllerMessengerMock(),
+      featureFlags: {
+        extensionActive: true,
+        mobileActive: false,
+        smartTransactions: {
+          expectedDeadline: 45,
+          maxDeadline: 150,
+          returnTxHashAsap: false,
+        },
+      },
+    };
+  };
+
+  beforeEach(() => {
+    addRequestCallback = () => undefined;
+  });
+
+  it('does not submit a transaction that is not a smart transaction', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.isSmartTransaction = false;
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: undefined });
+  });
+
+  it('falls back to regular transaction submit if /getFees throws an error', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    jest
+      .spyOn(request.smartTransactionsController, 'getFees')
+      .mockImplementation(() => {
+        throw new Error('Backend call to /getFees failed');
+      });
+    const result = await submitSmartTransactionHook(request);
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:endFlow',
+      {
+        id: 'approvalId',
+      },
+    );
+    expect(result).toEqual({ transactionHash: undefined });
+  });
+
+  it('returns a txHash asap if the feature flag requires it', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.featureFlags.smartTransactions.returnTxHashAsap = true;
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: txHash });
+  });
+
+  it('throws an error if there is no uuid', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.smartTransactionsController.submitSignedTransactions = jest.fn(
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      async ({ signedTransactions, signedCanceledTransactions }) => {
+        return { uuid: undefined };
+      },
+    );
+    await expect(submitSmartTransactionHook(request)).rejects.toThrow(
+      'No smart transaction UUID',
+    );
+  });
+
+  it('throws an error if there is no transaction hash', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    setImmediate(() => {
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'cancelled',
+          statusMetadata: {
+            minedHash: '',
+          },
+        },
+      );
+    });
+    await expect(submitSmartTransactionHook(request)).rejects.toThrow(
+      'Transaction does not have a transaction hash, there was a problem',
+    );
+  });
+
+  it('submits a smart transaction', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    setImmediate(() => {
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'pending',
+          statusMetadata: {
+            minedHash: '',
+          },
+        },
+      );
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'success',
+          statusMetadata: {
+            minedHash: txHash,
+          },
+        },
+      );
+    });
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: txHash });
+    const { txParams, chainId } = request.transactionMeta;
+    expect(
+      request.transactionController.approveTransactionsWithSameNonce,
+    ).toHaveBeenCalledWith(
+      [
+        {
+          ...txParams,
+          maxFeePerGas: '0x2fd8a58d7',
+          maxPriorityFeePerGas: '0xaa0f8a94',
+          chainId,
+        },
+      ],
+      { hasNonce: true },
+    );
+    expect(
+      request.smartTransactionsController.submitSignedTransactions,
+    ).toHaveBeenCalledWith({
+      signedTransactions: [createSignedTransaction()],
+      signedCanceledTransactions: [],
+      txParams,
+      transactionMeta: request.transactionMeta,
+    });
+    addRequestCallback();
+    expect(request.controllerMessenger.call).toHaveBeenCalledTimes(4);
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:startFlow',
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:addRequest',
+      {
+        id: 'approvalId',
+        origin: 'http://localhost',
+        type: 'smartTransaction:showSmartTransactionStatusPage',
+        requestState: {
+          smartTransaction: {
+            status: 'pending',
+            uuid,
+            creationTime: expect.any(Number),
+          },
+          isDapp: true,
+          txId,
+        },
+      },
+      true,
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:updateRequestState',
+      {
+        id: 'approvalId',
+        requestState: {
+          smartTransaction: {
+            status: 'success',
+            statusMetadata: {
+              minedHash:
+                '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356',
+            },
+          },
+          isDapp: true,
+          txId,
+        },
+      },
+    );
+
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:endFlow',
+      {
+        id: 'approvalId',
+      },
+    );
+  });
+
+  it('submits a smart transaction and does not update approval request if approval was already approved or rejected', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    setImmediate(() => {
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'pending',
+          uuid,
+          statusMetadata: {
+            minedHash: '',
+          },
+        },
+      );
+      addRequestCallback();
+      request.smartTransactionsController.eventEmitter.emit(
+        `uuid:smartTransaction`,
+        {
+          status: 'success',
+          uuid,
+          statusMetadata: {
+            minedHash: txHash,
+          },
+        },
+      );
+    });
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: txHash });
+    const { txParams, chainId } = request.transactionMeta;
+    expect(
+      request.transactionController.approveTransactionsWithSameNonce,
+    ).toHaveBeenCalledWith(
+      [
+        {
+          ...txParams,
+          maxFeePerGas: '0x2fd8a58d7',
+          maxPriorityFeePerGas: '0xaa0f8a94',
+          chainId,
+        },
+      ],
+      { hasNonce: true },
+    );
+    expect(
+      request.smartTransactionsController.submitSignedTransactions,
+    ).toHaveBeenCalledWith({
+      signedTransactions: [createSignedTransaction()],
+      signedCanceledTransactions: [],
+      txParams,
+      transactionMeta: request.transactionMeta,
+    });
+    expect(request.controllerMessenger.call).toHaveBeenCalledTimes(3);
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:startFlow',
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:addRequest',
+      {
+        id: 'approvalId',
+        origin: 'http://localhost',
+        type: 'smartTransaction:showSmartTransactionStatusPage',
+        requestState: {
+          smartTransaction: {
+            status: 'pending',
+            uuid,
+            creationTime: expect.any(Number),
+          },
+          isDapp: true,
+          txId,
+        },
+      },
+      true,
+    );
+    expect(request.controllerMessenger.call).toHaveBeenCalledWith(
+      'ApprovalController:endFlow',
+      {
+        id: 'approvalId',
+      },
+    );
+  });
+});
diff --git a/app/scripts/lib/transaction/smart-transactions.ts b/app/scripts/lib/transaction/smart-transactions.ts
new file mode 100644
index 000000000000..38f57f597947
--- /dev/null
+++ b/app/scripts/lib/transaction/smart-transactions.ts
@@ -0,0 +1,338 @@
+import SmartTransactionsController from '@metamask/smart-transactions-controller';
+import {
+  Fee,
+  Fees,
+  SmartTransactionStatuses,
+  SmartTransaction,
+} from '@metamask/smart-transactions-controller/dist/types';
+import type { Hex } from '@metamask/utils';
+import {
+  TransactionController,
+  TransactionMeta,
+  TransactionParams,
+} from '@metamask/transaction-controller';
+import log from 'loglevel';
+import {
+  RestrictedControllerMessenger,
+  EventConstraint,
+} from '@metamask/base-controller';
+import {
+  AddApprovalRequest,
+  UpdateRequestState,
+  StartFlow,
+  EndFlow,
+} from '@metamask/approval-controller';
+
+import { decimalToHex } from '../../../../shared/modules/conversion.utils';
+import { CANCEL_GAS_LIMIT_DEC } from '../../../../shared/constants/smartTransactions';
+import {
+  SMART_TRANSACTION_CONFIRMATION_TYPES,
+  ORIGIN_METAMASK,
+} from '../../../../shared/constants/app';
+
+const namespace = 'SmartTransactions';
+
+type AllowedActions =
+  | AddApprovalRequest
+  | UpdateRequestState
+  | StartFlow
+  | EndFlow;
+
+export type SmartTransactionsControllerMessenger =
+  RestrictedControllerMessenger<
+    typeof namespace,
+    AllowedActions,
+    EventConstraint,
+    AllowedActions['type'],
+    never
+  >;
+
+export type FeatureFlags = {
+  extensionActive: boolean;
+  mobileActive: boolean;
+  smartTransactions: {
+    expectedDeadline?: number;
+    maxDeadline?: number;
+    returnTxHashAsap?: boolean;
+  };
+};
+
+export type SubmitSmartTransactionRequest = {
+  transactionMeta: TransactionMeta;
+  smartTransactionsController: SmartTransactionsController;
+  transactionController: TransactionController;
+  isSmartTransaction: boolean;
+  controllerMessenger: SmartTransactionsControllerMessenger;
+  featureFlags: FeatureFlags;
+};
+
+class SmartTransactionHook {
+  #approvalFlowEnded: boolean;
+
+  #approvalFlowId: string;
+
+  #chainId: Hex;
+
+  #controllerMessenger: SmartTransactionsControllerMessenger;
+
+  #featureFlags: {
+    extensionActive: boolean;
+    mobileActive: boolean;
+    smartTransactions: {
+      expectedDeadline?: number;
+      maxDeadline?: number;
+      returnTxHashAsap?: boolean;
+    };
+  };
+
+  #isDapp: boolean;
+
+  #isSmartTransaction: boolean;
+
+  #smartTransactionsController: SmartTransactionsController;
+
+  #transactionController: TransactionController;
+
+  #transactionMeta: TransactionMeta;
+
+  #txParams: TransactionParams;
+
+  constructor(request: SubmitSmartTransactionRequest) {
+    const {
+      transactionMeta,
+      smartTransactionsController,
+      transactionController,
+      isSmartTransaction,
+      controllerMessenger,
+      featureFlags,
+    } = request;
+    this.#approvalFlowId = '';
+    this.#approvalFlowEnded = false;
+    this.#transactionMeta = transactionMeta;
+    this.#smartTransactionsController = smartTransactionsController;
+    this.#transactionController = transactionController;
+    this.#isSmartTransaction = isSmartTransaction;
+    this.#controllerMessenger = controllerMessenger;
+    this.#featureFlags = featureFlags;
+    this.#isDapp = transactionMeta.origin !== ORIGIN_METAMASK;
+    this.#chainId = transactionMeta.chainId;
+    this.#txParams = transactionMeta.txParams;
+  }
+
+  async submit() {
+    // Will cause TransactionController to publish to the RPC provider as normal.
+    const useRegularTransactionSubmit = { transactionHash: undefined };
+    if (!this.#isSmartTransaction) {
+      return useRegularTransactionSubmit;
+    }
+    const { id: approvalFlowId } = await this.#controllerMessenger.call(
+      'ApprovalController:startFlow',
+    );
+    this.#approvalFlowId = approvalFlowId;
+    let getFeesResponse;
+    try {
+      getFeesResponse = await this.#smartTransactionsController.getFees(
+        { ...this.#txParams, chainId: this.#chainId },
+        undefined,
+      );
+    } catch (error) {
+      log.error(
+        'Error in smart transaction publish hook, falling back to regular transaction submission',
+        error,
+      );
+      this.#onApproveOrReject();
+      return useRegularTransactionSubmit; // Fallback to regular transaction submission.
+    }
+    try {
+      const submitTransactionResponse = await this.#signAndSubmitTransactions({
+        getFeesResponse,
+      });
+      const uuid = submitTransactionResponse?.uuid;
+      if (!uuid) {
+        throw new Error('No smart transaction UUID');
+      }
+      const returnTxHashAsap =
+        this.#featureFlags?.smartTransactions?.returnTxHashAsap;
+      this.#addApprovalRequest({
+        uuid,
+      });
+      this.#addListenerToUpdateStatusPage({
+        uuid,
+      });
+      let transactionHash: string | undefined | null;
+      if (returnTxHashAsap && submitTransactionResponse?.txHash) {
+        transactionHash = submitTransactionResponse.txHash;
+      } else {
+        transactionHash = await this.#waitForTransactionHash({
+          uuid,
+        });
+      }
+      if (transactionHash === null) {
+        throw new Error(
+          'Transaction does not have a transaction hash, there was a problem',
+        );
+      }
+      return { transactionHash };
+    } catch (error) {
+      log.error('Error in smart transaction publish hook', error);
+      this.#onApproveOrReject();
+      throw error;
+    }
+  }
+
+  #onApproveOrReject() {
+    if (this.#approvalFlowEnded) {
+      return;
+    }
+    this.#approvalFlowEnded = true;
+    this.#controllerMessenger.call('ApprovalController:endFlow', {
+      id: this.#approvalFlowId,
+    });
+  }
+
+  #addApprovalRequest({ uuid }: { uuid: string }) {
+    const onApproveOrRejectWrapper = () => {
+      this.#onApproveOrReject();
+    };
+    this.#controllerMessenger
+      .call(
+        'ApprovalController:addRequest',
+        {
+          id: this.#approvalFlowId,
+          origin,
+          type: SMART_TRANSACTION_CONFIRMATION_TYPES.showSmartTransactionStatusPage,
+          requestState: {
+            smartTransaction: {
+              status: SmartTransactionStatuses.PENDING,
+              creationTime: Date.now(),
+              uuid,
+            },
+            isDapp: this.#isDapp,
+            txId: this.#transactionMeta.id,
+          },
+        },
+        true,
+      )
+      .then(onApproveOrRejectWrapper, onApproveOrRejectWrapper);
+  }
+
+  async #updateApprovalRequest({
+    smartTransaction,
+  }: {
+    smartTransaction: SmartTransaction;
+  }) {
+    return await this.#controllerMessenger.call(
+      'ApprovalController:updateRequestState',
+      {
+        id: this.#approvalFlowId,
+        requestState: {
+          smartTransaction,
+          isDapp: this.#isDapp,
+          txId: this.#transactionMeta.id,
+        },
+      },
+    );
+  }
+
+  async #addListenerToUpdateStatusPage({ uuid }: { uuid: string }) {
+    this.#smartTransactionsController.eventEmitter.on(
+      `${uuid}:smartTransaction`,
+      async (smartTransaction: SmartTransaction) => {
+        const { status } = smartTransaction;
+        if (!status || status === SmartTransactionStatuses.PENDING) {
+          return;
+        }
+        if (!this.#approvalFlowEnded) {
+          await this.#updateApprovalRequest({
+            smartTransaction,
+          });
+        }
+      },
+    );
+  }
+
+  #waitForTransactionHash({ uuid }: { uuid: string }): Promise<string | null> {
+    return new Promise((resolve) => {
+      this.#smartTransactionsController.eventEmitter.on(
+        `${uuid}:smartTransaction`,
+        async (smartTransaction: SmartTransaction) => {
+          const { status, statusMetadata } = smartTransaction;
+          if (!status || status === SmartTransactionStatuses.PENDING) {
+            return;
+          }
+          log.debug('Smart Transaction: ', smartTransaction);
+          if (statusMetadata?.minedHash) {
+            log.debug(
+              'Smart Transaction - Received tx hash: ',
+              statusMetadata?.minedHash,
+            );
+            resolve(statusMetadata.minedHash);
+          } else {
+            resolve(null);
+          }
+        },
+      );
+    });
+  }
+
+  async #signAndSubmitTransactions({
+    getFeesResponse,
+  }: {
+    getFeesResponse: Fees;
+  }) {
+    const signedTransactions = await this.#createSignedTransactions(
+      getFeesResponse.tradeTxFees?.fees ?? [],
+      false,
+    );
+    const signedCanceledTransactions = await this.#createSignedTransactions(
+      getFeesResponse.tradeTxFees?.cancelFees || [],
+      true,
+    );
+    return await this.#smartTransactionsController.submitSignedTransactions({
+      signedTransactions,
+      signedCanceledTransactions,
+      txParams: this.#txParams,
+      transactionMeta: this.#transactionMeta,
+    });
+  }
+
+  #applyFeeToTransaction(fee: Fee, isCancel: boolean): TransactionParams {
+    const unsignedTransaction = {
+      ...this.#txParams,
+      maxFeePerGas: `0x${decimalToHex(fee.maxFeePerGas)}`,
+      maxPriorityFeePerGas: `0x${decimalToHex(fee.maxPriorityFeePerGas)}`,
+      gas: isCancel
+        ? `0x${decimalToHex(CANCEL_GAS_LIMIT_DEC)}` // It has to be 21000 for cancel transactions, otherwise the API would reject it.
+        : this.#txParams.gas,
+    };
+    if (isCancel) {
+      unsignedTransaction.to = unsignedTransaction.from;
+      unsignedTransaction.data = '0x';
+    }
+    return unsignedTransaction;
+  }
+
+  async #createSignedTransactions(
+    fees: Fee[],
+    isCancel: boolean,
+  ): Promise<string[]> {
+    const unsignedTransactions = fees.map((fee) => {
+      return this.#applyFeeToTransaction(fee, isCancel);
+    });
+    const transactionsWithChainId = unsignedTransactions.map((tx) => ({
+      ...tx,
+      chainId: tx.chainId || this.#chainId,
+    }));
+    return (await this.#transactionController.approveTransactionsWithSameNonce(
+      transactionsWithChainId,
+      { hasNonce: true },
+    )) as string[];
+  }
+}
+
+export const submitSmartTransactionHook = (
+  request: SubmitSmartTransactionRequest,
+) => {
+  const smartTransactionHook = new SmartTransactionHook(request);
+  return smartTransactionHook.submit();
+};
diff --git a/app/scripts/lib/transaction/util.test.ts b/app/scripts/lib/transaction/util.test.ts
index b69fec9ae959..9b31caff37e0 100644
--- a/app/scripts/lib/transaction/util.test.ts
+++ b/app/scripts/lib/transaction/util.test.ts
@@ -515,6 +515,8 @@ describe('Transaction Utils', () => {
 
         request.securityAlertsEnabled = true;
         request.chainId = '0x1';
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         request.ppomController.usePPOM = (callback: any) => callback(ppomMock);
 
         await addTransaction(request);
diff --git a/app/scripts/lib/transaction/util.ts b/app/scripts/lib/transaction/util.ts
index f625dcbfb709..1781dd19a416 100644
--- a/app/scripts/lib/transaction/util.ts
+++ b/app/scripts/lib/transaction/util.ts
@@ -12,6 +12,7 @@ import {
   AddUserOperationOptions,
   UserOperationController,
 } from '@metamask/user-operation-controller';
+import type { Hex } from '@metamask/utils';
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 import { PPOMController } from '@metamask/ppom-validator';
 import { captureException } from '@sentry/browser';
@@ -34,6 +35,7 @@ export type SecurityAlertResponse = {
   result_type: string;
   providerRequestsCount?: Record<string, number>;
   securityAlertId?: string;
+  description?: string;
 };
 
 export type AddTransactionOptions = NonNullable<
@@ -59,7 +61,7 @@ export type AddTransactionOptions = NonNullable<
 >;
 
 type BaseAddTransactionRequest = {
-  chainId: string;
+  chainId: Hex;
   networkClientId: string;
   ppomController: PPOMController;
   securityAlertsEnabled: boolean;
@@ -78,6 +80,8 @@ export type AddTransactionRequest = FinalAddTransactionRequest & {
 };
 
 export type AddDappTransactionRequest = BaseAddTransactionRequest & {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   dappRequest: Record<string, any>;
 };
 
@@ -270,6 +274,8 @@ async function addUserOperationWithController(
   } = request;
 
   const { maxFeePerGas, maxPriorityFeePerGas } = transactionParams;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { origin, requireApproval, type } = transactionOptions as any;
 
   const normalisedTransaction: TransactionParams = {
diff --git a/app/scripts/lib/util.test.js b/app/scripts/lib/util.test.js
index 2ac5970493ce..1868007f7684 100644
--- a/app/scripts/lib/util.test.js
+++ b/app/scripts/lib/util.test.js
@@ -15,6 +15,7 @@ import {
 } from '../../../shared/constants/app';
 import { isPrefixedFormattedHexString } from '../../../shared/modules/network.utils';
 import {
+  shouldEmitDappViewedEvent,
   addUrlProtocolPrefix,
   deferredPromise,
   formatTxMetaForRpcResult,
@@ -255,6 +256,19 @@ describe('app utils', () => {
     });
   });
 
+  describe('shouldEmitDappViewedEvent', () => {
+    it('should return true for valid metrics IDs', () => {
+      expect(shouldEmitDappViewedEvent('fake-metrics-id-fd20')).toStrictEqual(
+        true,
+      );
+    });
+    it('should return false for invalid metrics IDs', () => {
+      expect(
+        shouldEmitDappViewedEvent('fake-metrics-id-invalid'),
+      ).toStrictEqual(false);
+    });
+  });
+
   describe('formatTxMetaForRpcResult', () => {
     it('should correctly format the tx meta object (EIP-1559)', () => {
       const txMeta = {
diff --git a/app/scripts/lib/util.ts b/app/scripts/lib/util.ts
index 77c2e8543b64..91aa9058b8a0 100644
--- a/app/scripts/lib/util.ts
+++ b/app/scripts/lib/util.ts
@@ -181,6 +181,8 @@ export const isValidDate = (d: Date | number) => {
  */
 
 type DeferredPromise = {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   promise: Promise<any>;
   resolve?: () => void;
   reject?: () => void;
@@ -274,6 +276,25 @@ export function isWebUrl(urlString: string): boolean {
   );
 }
 
+/**
+ * Determines whether to emit a MetaMetrics event for a given metaMetricsId.
+ * Relies on the last 4 characters of the metametricsId. Assumes the IDs are evenly distributed.
+ * If metaMetricsIds are distributed evenly, this should be a 1% sample rate
+ *
+ * @param metaMetricsId - The metametricsId to use for the event.
+ * @returns Whether to emit the event or not.
+ */
+export function shouldEmitDappViewedEvent(metaMetricsId: string): boolean {
+  if (metaMetricsId === null) {
+    return false;
+  }
+
+  const lastFourCharacters = metaMetricsId.slice(-4);
+  const lastFourCharactersAsNumber = parseInt(lastFourCharacters, 16);
+
+  return lastFourCharactersAsNumber % 100 === 0;
+}
+
 type FormattedTransactionMeta = {
   blockHash: string | null;
   blockNumber: string | null;
diff --git a/app/scripts/metamask-controller.actions.test.js b/app/scripts/metamask-controller.actions.test.js
index 31dcd6d5bf36..b260d23dbbce 100644
--- a/app/scripts/metamask-controller.actions.test.js
+++ b/app/scripts/metamask-controller.actions.test.js
@@ -14,7 +14,7 @@ import { PermissionsRequestNotFoundError } from '@metamask/permission-controller
 import nock from 'nock';
 import mockEncryptor from '../../test/lib/mock-encryptor';
 
-const { Ganache } = require('../../test/e2e/ganache');
+const { Ganache } = require('../../test/e2e/seeder/ganache');
 
 const ganacheServer = new Ganache();
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2153c5c61558..2aed7de9f559 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -24,8 +24,10 @@ import {
   wrap,
   ///: END:ONLY_INCLUDE_IF
 } from 'lodash';
-import { keyringBuilderFactory } from '@metamask/eth-keyring-controller';
-import { KeyringController } from '@metamask/keyring-controller';
+import {
+  KeyringController,
+  keyringBuilderFactory,
+} from '@metamask/keyring-controller';
 import createFilterMiddleware from '@metamask/eth-json-rpc-filters';
 import createSubscriptionManager from '@metamask/eth-json-rpc-filters/subscriptionManager';
 import {
@@ -151,6 +153,11 @@ import {
 } from '@metamask/snaps-utils';
 ///: END:ONLY_INCLUDE_IF
 
+import {
+  methodsRequiringNetworkSwitch,
+  methodsWithConfirmation,
+} from '../../shared/constants/methods-tags';
+
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
 ///: END:ONLY_INCLUDE_IF
@@ -160,17 +167,15 @@ import {
   TokenStandard,
   SIGNING_METHODS,
 } from '../../shared/constants/transaction';
-import {
-  GAS_API_BASE_URL,
-  GAS_DEV_API_BASE_URL,
-  SWAPS_CLIENT_ID,
-} from '../../shared/constants/swaps';
+import { SWAPS_CLIENT_ID } from '../../shared/constants/swaps';
 import {
   CHAIN_IDS,
   NETWORK_TYPES,
   TEST_NETWORK_TICKER_MAP,
   NetworkStatus,
 } from '../../shared/constants/network';
+import { getAllowedSmartTransactionsChainIds } from '../../shared/constants/smartTransactions';
+
 import {
   HardwareDeviceNames,
   LedgerTransportTypes,
@@ -211,6 +216,12 @@ import { STATIC_MAINNET_TOKEN_LIST } from '../../shared/constants/tokens';
 import { getTokenValueParam } from '../../shared/lib/metamask-controller-utils';
 import { isManifestV3 } from '../../shared/modules/mv3.utils';
 import { convertNetworkId } from '../../shared/modules/network.utils';
+import {
+  getIsSmartTransaction,
+  getFeatureFlagsByChainId,
+  getSmartTransactionsOptInStatus,
+  getCurrentChainSupportsSmartTransactions,
+} from '../../shared/modules/selectors';
 import {
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   handleMMITransactionUpdate,
@@ -234,6 +245,7 @@ import {
   getAdditionalSignArguments as getAdditionalSignArgumentsMMI,
 } from './lib/transaction/mmi-hooks';
 ///: END:ONLY_INCLUDE_IF
+import { submitSmartTransactionHook } from './lib/transaction/smart-transactions';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { keyringSnapPermissionsBuilder } from './lib/keyring-snaps-permissions';
 ///: END:ONLY_INCLUDE_IF
@@ -304,6 +316,14 @@ import { snapKeyringBuilder, getAccountsBySnapId } from './lib/snap-keyring';
 import { encryptorFactory } from './lib/encryptor-factory';
 import { addDappTransaction, addTransaction } from './lib/transaction/util';
 import { LatticeKeyringOffscreen } from './lib/offscreen-bridge/lattice-offscreen-keyring';
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
+import PREINSTALLED_SNAPS from './snaps/preinstalled-snaps';
+///: END:ONLY_INCLUDE_IF
+import AuthenticationController from './controllers/authentication/authentication-controller';
+import UserStorageController from './controllers/user-storage/user-storage-controller';
+import { WeakRefObjectMap } from './lib/WeakRefObjectMap';
+
+import { PushPlatformNotificationsController } from './controllers/push-platform-notifications/push-platform-notifications';
 
 export const METAMASK_CONTROLLER_EVENTS = {
   // Fired after state changes that impact the extension badge (unapproved msg count)
@@ -400,6 +420,12 @@ export default class MetamaskController extends EventEmitter {
 
     // next, we will initialize the controllers
     // controller initialization order matters
+    const clearPendingConfirmations = () => {
+      this.encryptionPublicKeyController.clearUnapproved();
+      this.decryptMessageController.clearUnapproved();
+      this.signatureController.clearUnapproved();
+      this.approvalController.clear(ethErrors.provider.userRejectedRequest());
+    };
 
     this.queuedRequestController = new QueuedRequestController({
       messenger: this.controllerMessenger.getRestricted({
@@ -409,7 +435,10 @@ export default class MetamaskController extends EventEmitter {
           'NetworkController:setActiveNetwork',
           'SelectedNetworkController:getNetworkClientIdForDomain',
         ],
+        allowedEvents: ['SelectedNetworkController:stateChange'],
       }),
+      methodsRequiringNetworkSwitch,
+      clearPendingConfirmations,
     });
 
     this.approvalController = new ApprovalController({
@@ -486,28 +515,13 @@ export default class MetamaskController extends EventEmitter {
       this.networkController.getProviderAndBlockTracker().provider;
     this.blockTracker =
       this.networkController.getProviderAndBlockTracker().blockTracker;
-
-    // TODO: Delete when ready to remove `networkVersion` from provider object
-    this.deprecatedNetworkId = null;
-    networkControllerMessenger.subscribe(
-      'NetworkController:networkDidChange',
-      () => this.updateDeprecatedNetworkId(),
-    );
+    this.deprecatedNetworkVersions = {};
 
     const tokenListMessenger = this.controllerMessenger.getRestricted({
       name: 'TokenListController',
       allowedEvents: ['NetworkController:stateChange'],
     });
 
-    this.tokenListController = new TokenListController({
-      chainId: this.networkController.state.providerConfig.chainId,
-      preventPollingOnNetworkRestart: initState.TokenListController
-        ? initState.TokenListController.preventPollingOnNetworkRestart
-        : true,
-      messenger: tokenListMessenger,
-      state: initState.TokenListController,
-    });
-
     const preferencesMessenger = this.controllerMessenger.getRestricted({
       name: 'PreferencesController',
       allowedActions: [],
@@ -527,6 +541,15 @@ export default class MetamaskController extends EventEmitter {
         ),
     });
 
+    this.tokenListController = new TokenListController({
+      chainId: this.networkController.state.providerConfig.chainId,
+      preventPollingOnNetworkRestart: !this.#isTokenListPollingRequired(
+        this.preferencesController.store.getState(),
+      ),
+      messenger: tokenListMessenger,
+      state: initState.TokenListController,
+    });
+
     this.assetsContractController = new AssetsContractController(
       {
         chainId: this.networkController.state.providerConfig.chainId,
@@ -684,6 +707,14 @@ export default class MetamaskController extends EventEmitter {
       addNft: this.nftController.addNft.bind(this.nftController),
       getNftApi: this.nftController.getNftApi.bind(this.nftController),
       getNftState: () => this.nftController.state,
+      // added this to track previous value of useNftDetection, should be true on very first initializing of controller[]
+      disabled:
+        this.preferencesController.store.getState().useNftDetection ===
+        undefined
+          ? true
+          : !this.preferencesController.store.getState().useNftDetection,
+      selectedAddress:
+        this.preferencesController.store.getState().selectedAddress,
     });
 
     this.metaMetricsController = new MetaMetricsController({
@@ -720,10 +751,6 @@ export default class MetamaskController extends EventEmitter {
       allowedEvents: ['NetworkController:stateChange'],
     });
 
-    const gasApiBaseUrl = process.env.SWAPS_USE_DEV_APIS
-      ? GAS_DEV_API_BASE_URL
-      : GAS_API_BASE_URL;
-
     this.gasFeeController = new GasFeeController({
       state: initState.GasFeeController,
       interval: 10000,
@@ -743,13 +770,12 @@ export default class MetamaskController extends EventEmitter {
         ),
       getCurrentAccountEIP1559Compatibility:
         this.getCurrentAccountEIP1559Compatibility.bind(this),
-      legacyAPIEndpoint: `${gasApiBaseUrl}/networks/<chain_id>/gasPrices`,
-      EIP1559APIEndpoint: `${gasApiBaseUrl}/networks/<chain_id>/suggestedGasFees`,
       getCurrentNetworkLegacyGasAPICompatibility: () => {
         const { chainId } = this.networkController.state.providerConfig;
         return chainId === CHAIN_IDS.BSC;
       },
       getChainId: () => this.networkController.state.providerConfig.chainId,
+      infuraAPIKey: opts.infuraProjectId,
     });
 
     this.appStateController = new AppStateController({
@@ -898,21 +924,14 @@ export default class MetamaskController extends EventEmitter {
       },
       initState.TokenRatesController,
     );
-    if (this.preferencesController.store.getState().useCurrencyRateCheck) {
-      this.tokenRatesController.start();
-    }
 
     this.preferencesController.store.subscribe(
       previousValueComparator((prevState, currState) => {
         const { useCurrencyRateCheck: prevUseCurrencyRateCheck } = prevState;
         const { useCurrencyRateCheck: currUseCurrencyRateCheck } = currState;
         if (currUseCurrencyRateCheck && !prevUseCurrencyRateCheck) {
-          this.currencyRateController.startPollingByNetworkClientId(
-            this.networkController.state.selectedNetworkClientId,
-          );
           this.tokenRatesController.start();
         } else if (!currUseCurrencyRateCheck && prevUseCurrencyRateCheck) {
-          this.currencyRateController.stopAllPolling();
           this.tokenRatesController.stop();
         }
       }, this.preferencesController.store.getState()),
@@ -979,6 +998,7 @@ export default class MetamaskController extends EventEmitter {
       additionalKeyrings.push(
         mmiKeyringBuilderFactory(CUSTODIAN_TYPES[custodianType].keyringClass, {
           mmiConfigurationController: this.mmiConfigurationController,
+          captureException,
         }),
       );
     }
@@ -1060,35 +1080,6 @@ export default class MetamaskController extends EventEmitter {
       state: initState.KeyringController,
       encryptor: opts.encryptor || encryptorFactory(600_000),
       messenger: keyringControllerMessenger,
-      removeIdentity: this.preferencesController.removeAddress.bind(
-        this.preferencesController,
-      ),
-      setAccountLabel: (address, label) => {
-        const accountToBeNamed =
-          this.accountsController.getAccountByAddress(address);
-        if (accountToBeNamed === undefined) {
-          throw new Error(`No account found for address: ${address}`);
-        }
-        this.accountsController.setAccountName(accountToBeNamed.id, label);
-
-        this.preferencesController.setAccountLabel(address, label);
-      },
-      setSelectedAddress: (address) => {
-        const accountToBeSet =
-          this.accountsController.getAccountByAddress(address);
-        if (accountToBeSet === undefined) {
-          throw new Error(`No account found for address: ${address}`);
-        }
-
-        this.accountsController.setSelectedAccount(accountToBeSet.id);
-        this.preferencesController.setSelectedAddress(address);
-      },
-      syncIdentities: (identities) => {
-        this.preferencesController.syncAddresses(identities);
-      },
-      updateIdentities: this.preferencesController.setAddresses.bind(
-        this.preferencesController,
-      ),
     });
 
     this.controllerMessenger.subscribe('KeyringController:unlock', () =>
@@ -1097,6 +1088,7 @@ export default class MetamaskController extends EventEmitter {
     this.controllerMessenger.subscribe('KeyringController:lock', () =>
       this._onLock(),
     );
+
     this.controllerMessenger.subscribe(
       'KeyringController:stateChange',
       (state) => {
@@ -1173,6 +1165,7 @@ export default class MetamaskController extends EventEmitter {
         allowedActions: [
           'NetworkController:getNetworkClientById',
           'NetworkController:getState',
+          'NetworkController:getSelectedNetworkClient',
           'PermissionController:hasPermissions',
           'PermissionController:getSubjectNames',
         ],
@@ -1182,9 +1175,11 @@ export default class MetamaskController extends EventEmitter {
         ],
       }),
       state: initState.SelectedNetworkController,
-      getUseRequestQueue: this.preferencesController.getUseRequestQueue.bind(
-        this.preferencesController,
-      ),
+      useRequestQueuePreference:
+        this.preferencesController.store.getState().useRequestQueue,
+      onPreferencesStateChange: (listener) =>
+        this.preferencesController.store.subscribe(listener),
+      domainProxyMap: new WeakRefObjectMap(),
     });
 
     this.permissionLogController = new PermissionLogController({
@@ -1284,6 +1279,9 @@ export default class MetamaskController extends EventEmitter {
         allowLocalSnaps,
         requireAllowlist,
       },
+      encryptor: encryptorFactory(600_000),
+      getMnemonic: this.getPrimaryKeyringMnemonic.bind(this),
+      preinstalledSnaps: PREINSTALLED_SNAPS,
     });
 
     this.notificationController = new NotificationController({
@@ -1390,6 +1388,36 @@ export default class MetamaskController extends EventEmitter {
 
     ///: END:ONLY_INCLUDE_IF
 
+    // Notification Controllers
+    this.authenticationController = new AuthenticationController({
+      state: initState.AuthenticationController,
+      messenger: this.controllerMessenger.getRestricted({
+        name: 'AuthenticationController',
+        allowedActions: ['SnapController:handleRequest'],
+      }),
+    });
+    this.userStorageController = new UserStorageController({
+      state: initState.UserStorageController,
+      messenger: this.controllerMessenger.getRestricted({
+        name: 'UserStorageController',
+        allowedActions: [
+          'SnapController:handleRequest',
+          'AuthenticationController:getBearerToken',
+          'AuthenticationController:getSessionProfile',
+          'AuthenticationController:isSignedIn',
+          'AuthenticationController:performSignIn',
+        ],
+      }),
+    });
+    this.pushPlatformNotificationsController =
+      new PushPlatformNotificationsController({
+        messenger: this.controllerMessenger.getRestricted({
+          name: 'PushPlatformNotificationsController',
+          allowedActions: ['AuthenticationController:getBearerToken'],
+        }),
+        state: initState.PushPlatformNotificationsController,
+      });
+
     // account tracker watches balances, nonces, and any code at their address
     this.accountTracker = new AccountTracker({
       provider: this.provider,
@@ -1431,8 +1459,14 @@ export default class MetamaskController extends EventEmitter {
         const { completedOnboarding: prevCompletedOnboarding } = prevState;
         const { completedOnboarding: currCompletedOnboarding } = currState;
         if (!prevCompletedOnboarding && currCompletedOnboarding) {
+          const { address } = this.accountsController.getSelectedAccount();
+
           this.postOnboardingInitialization();
           this.triggerNetworkrequests();
+          // execute once the token detection on the post-onboarding
+          await this.tokenDetectionController.detectTokens({
+            selectedAddress: address,
+          });
         }
       }, this.onboardingController.store.getState()),
     );
@@ -1594,7 +1628,17 @@ export default class MetamaskController extends EventEmitter {
           () => listener(),
         );
       },
+      pendingTransactions: {
+        isResubmitEnabled: () => {
+          const state = this._getMetaMaskState();
+          return !(
+            getSmartTransactionsOptInStatus(state) &&
+            getCurrentChainSupportsSmartTransactions(state)
+          );
+        },
+      },
       provider: this.provider,
+      testGasFeeFlows: process.env.TEST_GAS_FEE_FLOWS,
       hooks: {
         ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
         afterSign: (txMeta, signedEthTx) =>
@@ -1611,6 +1655,7 @@ export default class MetamaskController extends EventEmitter {
         beforePublish: beforeTransactionPublishMMI.bind(this),
         getAdditionalSignArguments: getAdditionalSignArgumentsMMI.bind(this),
         ///: END:ONLY_INCLUDE_IF
+        publish: this._publishSmartTransactionHook.bind(this),
       },
       sign: (...args) => this.keyringController.signTransaction(...args),
       state: initState.TransactionController,
@@ -1618,25 +1663,6 @@ export default class MetamaskController extends EventEmitter {
 
     this._addTransactionControllerListeners();
 
-    networkControllerMessenger.subscribe(
-      'NetworkController:networkDidChange',
-      async () => {
-        try {
-          if (
-            this.preferencesController.store.getState().useCurrencyRateCheck
-          ) {
-            await this.currencyRateController.stopAllPolling();
-            this.currencyRateController.startPollingByNetworkClientId(
-              this.networkController.state.selectedNetworkClientId,
-            );
-          }
-        } catch (error) {
-          // TODO: Handle failure to get conversion rate more gracefully
-          console.error(error);
-        }
-      },
-    );
-
     this.decryptMessageController = new DecryptMessageController({
       getState: this.getState.bind(this),
       messenger: this.controllerMessenger.getRestricted({
@@ -1761,6 +1787,10 @@ export default class MetamaskController extends EventEmitter {
         this.txController.updateTransaction(txMeta, note),
       updateTransactionHash: (id, hash) =>
         this.txController.updateCustodialTransaction(id, { hash }),
+      setChannelId: (channelId) =>
+        this.institutionalFeaturesController.setChannelId(channelId),
+      setConnectionRequest: (payload) =>
+        this.institutionalFeaturesController.setConnectionRequest(payload),
     });
     ///: END:ONLY_INCLUDE_IF
 
@@ -1784,6 +1814,11 @@ export default class MetamaskController extends EventEmitter {
           this.gasFeeController.fetchGasFeeEstimates.bind(
             this.gasFeeController,
           ),
+        getLayer1GasFee: this.txController.getLayer1GasFee.bind(
+          this.txController,
+        ),
+        getNetworkClientId: () =>
+          this.networkController.state.selectedNetworkClientId,
         trackMetaMetricsEvent: this.metaMetricsController.trackEvent.bind(
           this.metaMetricsController,
         ),
@@ -1799,18 +1834,19 @@ export default class MetamaskController extends EventEmitter {
           networkControllerMessenger,
           'NetworkController:stateChange',
         ),
-        getNonceLock: this.txController.nonceTracker.getNonceLock.bind(
-          this.txController.nonceTracker,
-        ),
+        getNonceLock: this.txController.getNonceLock.bind(this.txController),
         confirmExternalTransaction:
           this.txController.confirmExternalTransaction.bind(this.txController),
+        getTransactions: this.txController.getTransactions.bind(
+          this.txController,
+        ),
         provider: this.provider,
         trackMetaMetricsEvent: this.metaMetricsController.trackEvent.bind(
           this.metaMetricsController,
         ),
       },
       {
-        supportedChainIds: [CHAIN_IDS.MAINNET, CHAIN_IDS.GOERLI],
+        supportedChainIds: getAllowedSmartTransactionsChainIds(),
       },
       initState.SmartTransactionsController,
     );
@@ -1906,12 +1942,7 @@ export default class MetamaskController extends EventEmitter {
     // clear unapproved transactions and messages when the network will change
     networkControllerMessenger.subscribe(
       'NetworkController:networkWillChange',
-      () => {
-        this.encryptionPublicKeyController.clearUnapproved();
-        this.decryptMessageController.clearUnapproved();
-        this.signatureController.clearUnapproved();
-        this.approvalController.clear(ethErrors.provider.userRejectedRequest());
-      },
+      clearPendingConfirmations.bind(this),
     );
 
     this.metamaskMiddleware = createMetamaskMiddleware({
@@ -2201,7 +2232,6 @@ export default class MetamaskController extends EventEmitter {
   }
 
   postOnboardingInitialization() {
-    this.updateDeprecatedNetworkId();
     this.networkController.lookupNetwork();
   }
 
@@ -2213,12 +2243,15 @@ export default class MetamaskController extends EventEmitter {
     const preferencesControllerState =
       this.preferencesController.store.getState();
 
-    const { useCurrencyRateCheck } = preferencesControllerState;
+    const { useCurrencyRateCheck, useNftDetection } =
+      preferencesControllerState;
+
+    if (useNftDetection) {
+      this.nftDetectionController.start();
+    }
 
     if (useCurrencyRateCheck) {
-      this.currencyRateController.startPollingByNetworkClientId(
-        this.networkController.state.selectedNetworkClientId,
-      );
+      this.tokenRatesController.start();
     }
 
     if (this.#isTokenListPollingRequired(preferencesControllerState)) {
@@ -2230,6 +2263,7 @@ export default class MetamaskController extends EventEmitter {
     this.accountTracker.stop();
     this.txController.stopIncomingTransactionPolling();
     this.tokenDetectionController.disable();
+    this.nftDetectionController.stop();
 
     const preferencesControllerState =
       this.preferencesController.store.getState();
@@ -2237,12 +2271,11 @@ export default class MetamaskController extends EventEmitter {
     const { useCurrencyRateCheck } = preferencesControllerState;
 
     if (useCurrencyRateCheck) {
-      this.currencyRateController.stopAllPolling();
+      this.tokenRatesController.stop();
     }
 
     if (this.#isTokenListPollingRequired(preferencesControllerState)) {
       this.tokenListController.stop();
-      this.tokenRatesController.stop();
     }
   }
 
@@ -2370,15 +2403,11 @@ export default class MetamaskController extends EventEmitter {
    * Constructor helper for getting Snap permission specifications.
    */
   getSnapPermissionSpecifications() {
-    const snapEncryptor = encryptorFactory(600_000);
-
     return {
       ...buildSnapEndowmentSpecifications(Object.keys(ExcludedSnapEndowments)),
       ...buildSnapRestrictedMethodSpecifications(
         Object.keys(ExcludedSnapPermissions),
         {
-          encrypt: snapEncryptor.encrypt,
-          decrypt: snapEncryptor.decrypt,
           getLocale: this.getLocale.bind(this),
           clearSnapState: this.controllerMessenger.call.bind(
             this.controllerMessenger,
@@ -2678,20 +2707,21 @@ export default class MetamaskController extends EventEmitter {
     // subset of state for metamask inpage provider
     const publicConfigStore = new ObservableStore();
 
-    const selectPublicState = (chainId, { isUnlocked }) => {
+    const selectPublicState = async ({ isUnlocked }) => {
+      const { chainId, networkVersion } = await this.getProviderNetworkState();
+
       return {
         isUnlocked,
         chainId,
-        networkVersion: this.deprecatedNetworkId ?? 'loading',
+        networkVersion: networkVersion ?? 'loading',
       };
     };
 
-    const updatePublicConfigStore = (memState) => {
+    const updatePublicConfigStore = async (memState) => {
       const networkStatus =
         memState.networksMetadata[memState.selectedNetworkClientId]?.status;
-      const { chainId } = this.networkController.state.providerConfig;
       if (networkStatus === NetworkStatus.Available) {
-        publicConfigStore.putState(selectPublicState(chainId, memState));
+        publicConfigStore.putState(await selectPublicState(memState));
       }
     };
 
@@ -2709,12 +2739,14 @@ export default class MetamaskController extends EventEmitter {
    * @returns {Promise<{ isUnlocked: boolean, networkVersion: string, chainId: string, accounts: string[] }>} An object with relevant state properties.
    */
   async getProviderState(origin) {
+    const providerNetworkState = await this.getProviderNetworkState(
+      this.preferencesController.getUseRequestQueue() ? origin : undefined,
+    );
+
     return {
       isUnlocked: this.isUnlocked(),
       accounts: await this.getPermittedAccounts(origin),
-      ...this.getProviderNetworkState(
-        this.preferencesController.getUseRequestQueue() ? origin : undefined,
-      ),
+      ...providerNetworkState,
     };
   }
 
@@ -2724,71 +2756,41 @@ export default class MetamaskController extends EventEmitter {
    * @param {string} origin - The origin identifier for which network state is requested (default: 'metamask').
    * @returns {object} An object containing important network state properties, including chainId and networkVersion.
    */
-  getProviderNetworkState(origin = METAMASK_DOMAIN) {
-    let chainId;
-    if (
-      this.preferencesController.getUseRequestQueue() &&
-      origin !== METAMASK_DOMAIN
-    ) {
-      const networkClientId = this.controllerMessenger.call(
-        'SelectedNetworkController:getNetworkClientIdForDomain',
-        origin,
-      );
+  async getProviderNetworkState(origin = METAMASK_DOMAIN) {
+    const networkClientId = this.controllerMessenger.call(
+      'SelectedNetworkController:getNetworkClientIdForDomain',
+      origin,
+    );
 
-      const networkClient = this.controllerMessenger.call(
-        'NetworkController:getNetworkClientById',
-        networkClientId,
-      );
-      chainId = networkClient.configuration.chainId;
-    } else {
-      chainId = this.networkController.state.providerConfig.chainId;
-    }
+    const networkClient = this.controllerMessenger.call(
+      'NetworkController:getNetworkClientById',
+      networkClientId,
+    );
 
-    return {
-      chainId,
-      networkVersion: this.deprecatedNetworkId ?? 'loading',
-    };
-  }
+    const { chainId } = networkClient.configuration;
 
-  /**
-   * TODO: Delete when ready to remove `networkVersion` from provider object
-   * Updates the `deprecatedNetworkId` value
-   */
-  async updateDeprecatedNetworkId() {
-    try {
-      this.deprecatedNetworkId = await this.deprecatedGetNetworkId();
-    } catch (error) {
-      console.error(error);
-      this.deprecatedNetworkId = null;
-    }
-    this._notifyChainChange();
-  }
+    const { completedOnboarding } = this.onboardingController.store.getState();
 
-  /**
-   * TODO: Delete when ready to remove `networkVersion` from provider object
-   * Gets current networkId as returned by `net_version`
-   *
-   * @returns {string} The networkId for the current network or null on failure
-   * @throws Will throw if there is a problem getting the network version
-   */
-  async deprecatedGetNetworkId() {
-    const ethQuery = this.controllerMessenger.call(
-      'NetworkController:getEthQuery',
-    );
-
-    if (!ethQuery) {
-      throw new Error('Provider has not been initialized');
+    let networkVersion = this.deprecatedNetworkVersions[networkClientId];
+    if (!networkVersion && completedOnboarding) {
+      const ethQuery = new EthQuery(networkClient.provider);
+      networkVersion = await new Promise((resolve) => {
+        ethQuery.sendAsync({ method: 'net_version' }, (error, result) => {
+          if (error) {
+            console.error(error);
+            resolve(null);
+          } else {
+            resolve(convertNetworkId(result));
+          }
+        });
+      });
+      this.deprecatedNetworkVersions[networkClientId] = networkVersion;
     }
 
-    return new Promise((resolve, reject) => {
-      ethQuery.sendAsync({ method: 'net_version' }, (error, result) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(convertNetworkId(result));
-        }
-      });
-    });
+    return {
+      chainId,
+      networkVersion: networkVersion ?? 'loading',
+    };
   }
 
   //=============================================================================
@@ -2953,6 +2955,10 @@ export default class MetamaskController extends EventEmitter {
         preferencesController.setIncomingTransactionsPreferences.bind(
           preferencesController,
         ),
+      setServiceWorkerKeepAlivePreference:
+        preferencesController.setServiceWorkerKeepAlivePreference.bind(
+          preferencesController,
+        ),
       markPasswordForgotten: this.markPasswordForgotten.bind(this),
       unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
       getRequestAccountTabIds: this.getRequestAccountTabIds,
@@ -3005,6 +3011,12 @@ export default class MetamaskController extends EventEmitter {
       setActiveNetwork: (networkConfigurationId) => {
         return this.networkController.setActiveNetwork(networkConfigurationId);
       },
+      setNetworkClientIdForDomain: (origin, networkClientId) => {
+        return this.selectedNetworkController.setNetworkClientIdForDomain(
+          origin,
+          networkClientId,
+        );
+      },
       rollbackToPreviousProvider:
         networkController.rollbackToPreviousProvider.bind(networkController),
       removeNetworkConfiguration:
@@ -3031,6 +3043,7 @@ export default class MetamaskController extends EventEmitter {
           throw new Error(`No account found for address: ${address}`);
         }
       },
+      toggleExternalServices: this.toggleExternalServices.bind(this),
       addToken: tokensController.addToken.bind(tokensController),
       updateTokenType: tokensController.updateTokenType.bind(tokensController),
       setFeatureFlag: preferencesController.setFeatureFlag.bind(
@@ -3120,6 +3133,8 @@ export default class MetamaskController extends EventEmitter {
       // AppStateController
       setLastActiveTime:
         appStateController.setLastActiveTime.bind(appStateController),
+      setCurrentExtensionPopupId:
+        appStateController.setCurrentExtensionPopupId.bind(appStateController),
       setDefaultHomeActiveTabName:
         appStateController.setDefaultHomeActiveTabName.bind(appStateController),
       setConnectedStatusPopoverHasBeenShown:
@@ -3158,8 +3173,6 @@ export default class MetamaskController extends EventEmitter {
         appStateController.setShowBetaHeader.bind(appStateController),
       setShowPermissionsTour:
         appStateController.setShowPermissionsTour.bind(appStateController),
-      setShowProductTour:
-        appStateController.setShowProductTour.bind(appStateController),
       setShowAccountBanner:
         appStateController.setShowAccountBanner.bind(appStateController),
       setShowNetworkBanner:
@@ -3168,6 +3181,14 @@ export default class MetamaskController extends EventEmitter {
         appStateController.updateNftDropDownState.bind(appStateController),
       setFirstTimeUsedNetwork:
         appStateController.setFirstTimeUsedNetwork.bind(appStateController),
+      setSwitchedNetworkDetails:
+        appStateController.setSwitchedNetworkDetails.bind(appStateController),
+      clearSwitchedNetworkDetails:
+        appStateController.clearSwitchedNetworkDetails.bind(appStateController),
+      setSwitchedNetworkNeverShowMessage:
+        appStateController.setSwitchedNetworkNeverShowMessage.bind(
+          appStateController,
+        ),
 
       // EnsController
       tryReverseResolveAddress:
@@ -3227,6 +3248,7 @@ export default class MetamaskController extends EventEmitter {
         txController.updatePreviousGasParams.bind(txController),
       abortTransactionSigning:
         txController.abortTransactionSigning.bind(txController),
+      getLayer1GasFee: txController.getLayer1GasFee.bind(txController),
 
       // decryptMessageController
       decryptMessage: this.decryptMessageController.decryptMessage.bind(
@@ -3318,6 +3340,10 @@ export default class MetamaskController extends EventEmitter {
         this.institutionalFeaturesController.removeAddTokenConnectRequest.bind(
           this.institutionalFeaturesController,
         ),
+      setConnectionRequest:
+        this.institutionalFeaturesController.setConnectionRequest.bind(
+          this.institutionalFeaturesController,
+        ),
       showInteractiveReplacementTokenBanner:
         appStateController.showInteractiveReplacementTokenBanner.bind(
           appStateController,
@@ -3437,10 +3463,6 @@ export default class MetamaskController extends EventEmitter {
         swapsController.setSwapsQuotesPollingLimitEnabled.bind(swapsController),
 
       // Smart Transactions
-      setSmartTransactionsOptInStatus:
-        smartTransactionsController.setOptInState.bind(
-          smartTransactionsController,
-        ),
       fetchSmartTransactionFees: smartTransactionsController.getFees.bind(
         smartTransactionsController,
       ),
@@ -3492,10 +3514,23 @@ export default class MetamaskController extends EventEmitter {
       rejectPendingApproval: this.rejectPendingApproval,
 
       // Notifications
+      resetViewedNotifications: announcementController.resetViewed.bind(
+        announcementController,
+      ),
       updateViewedNotifications: announcementController.updateViewed.bind(
         announcementController,
       ),
 
+      // CurrencyRateController
+      currencyRateStartPollingByNetworkClientId:
+        currencyRateController.startPollingByNetworkClientId.bind(
+          currencyRateController,
+        ),
+      currencyRateStopPollingByPollingToken:
+        currencyRateController.stopPollingByPollingToken.bind(
+          currencyRateController,
+        ),
+
       // GasFeeController
       gasFeeStartPollingByNetworkClientId:
         gasFeeController.startPollingByNetworkClientId.bind(gasFeeController),
@@ -3683,15 +3718,7 @@ export default class MetamaskController extends EventEmitter {
   async createNewVaultAndKeychain(password) {
     const releaseLock = await this.createVaultMutex.acquire();
     try {
-      const vault = await this.keyringController.createNewVaultAndKeychain(
-        password,
-      );
-
-      const accounts = await this.keyringController.getAccounts();
-      this.preferencesController.setAddresses(accounts);
-      this.selectFirstAccount();
-
-      return vault;
+      return await this.keyringController.createNewVaultAndKeychain(password);
     } finally {
       releaseLock();
     }
@@ -3709,9 +3736,6 @@ export default class MetamaskController extends EventEmitter {
     try {
       const seedPhraseAsBuffer = Buffer.from(encodedSeedPhrase);
 
-      // clear known identities
-      this.preferencesController.setAddresses([]);
-
       // clear permissions
       this.permissionController.clearState();
 
@@ -3778,8 +3802,6 @@ export default class MetamaskController extends EventEmitter {
       // Ledger Keyring GitHub downtime
       this.setLedgerTransportPreference();
 
-      this.selectFirstAccount();
-
       return vault;
     } finally {
       releaseLock();
@@ -3940,18 +3962,6 @@ export default class MetamaskController extends EventEmitter {
    * receiving funds from our automatic Ropsten faucet.
    */
 
-  /**
-   * Sets the first account in the state to the selected address
-   */
-  selectFirstAccount() {
-    const { identities } = this.preferencesController.store.getState();
-    const [address] = Object.keys(identities);
-    this.preferencesController.setSelectedAddress(address);
-
-    const [account] = this.accountsController.listAccounts();
-    this.accountsController.setSelectedAccount(account.id);
-  }
-
   /**
    * Gets the mnemonic of the user's primary keyring.
    */
@@ -4177,7 +4187,6 @@ export default class MetamaskController extends EventEmitter {
       keyring,
     );
     const newAccounts = await this.keyringController.getAccounts();
-    this.preferencesController.setAddresses(newAccounts);
     newAccounts.forEach((address) => {
       if (!oldAccounts.includes(address)) {
         const label = this.getAccountLabel(
@@ -4256,7 +4265,11 @@ export default class MetamaskController extends EventEmitter {
   async resetAccount() {
     const selectedAddress =
       this.accountsController.getSelectedAccount().address;
-    this.txController.wipeTransactions(true, selectedAddress);
+    this.txController.wipeTransactions(false, selectedAddress);
+    this.smartTransactionsController.wipeSmartTransactions({
+      address: selectedAddress,
+      ignoreNetwork: false,
+    });
     this.networkController.resetConnection();
 
     return selectedAddress;
@@ -4829,23 +4842,13 @@ export default class MetamaskController extends EventEmitter {
     // append selectedNetworkClientId to each request
     engine.push(createSelectedNetworkMiddleware(this.controllerMessenger));
 
-    let proxyClient;
-    if (
-      this.preferencesController.getUseRequestQueue() &&
-      this.selectedNetworkController.state.domains[origin]
-    ) {
-      proxyClient =
-        this.selectedNetworkController.getProviderAndBlockTracker(origin);
-    } else {
-      // if useRequestQueue is false we want to use the globally selected network provider/blockTracker
-      // since this means the per domain network feature is disabled
-
-      // if the origin is not in the selectedNetworkController's `domains` state,
-      // this means that origin does not have permissions (is not connected to the wallet)
-      // and will therefore not have its own selected network even if useRequestQueue is true
-      // and so in this case too we want to use the globally selected network provider/blockTracker
-      proxyClient = this.networkController.getProviderAndBlockTracker();
-    }
+    // if the origin is not in the selectedNetworkController's `domains` state
+    // when the provider engine is created, the selectedNetworkController will
+    // fetch the globally selected networkClient from the networkController and wrap
+    // it in a proxy which can be switched to use its own state if/when the origin
+    // is added to the `domains` state
+    const proxyClient =
+      this.selectedNetworkController.getProviderAndBlockTracker(origin);
 
     const requestQueueMiddleware = createQueuedRequestMiddleware({
       enqueueRequest: this.queuedRequestController.enqueueRequest.bind(
@@ -4854,6 +4857,7 @@ export default class MetamaskController extends EventEmitter {
       useRequestQueue: this.preferencesController.getUseRequestQueue.bind(
         this.preferencesController,
       ),
+      methodsWithConfirmation,
     });
     // add some middleware that will switch chain on each request (as needed)
     engine.push(requestQueueMiddleware);
@@ -4892,6 +4896,11 @@ export default class MetamaskController extends EventEmitter {
     );
     ///: END:ONLY_INCLUDE_IF
 
+    const isConfirmationRedesignEnabled = () => {
+      return this.preferencesController.store.getState().preferences
+        .redesignedConfirmationsEnabled;
+    };
+
     engine.push(
       createRPCMethodTrackingMiddleware({
         trackEvent: this.metaMetricsController.trackEvent.bind(
@@ -4902,6 +4911,7 @@ export default class MetamaskController extends EventEmitter {
         ),
         getAccountType: this.getAccountType.bind(this),
         getDeviceModel: this.getDeviceModel.bind(this),
+        isConfirmationRedesignEnabled,
         snapAndHardwareMessenger: this.controllerMessenger.getRestricted({
           name: 'SnapAndHardwareMessenger',
           allowedActions: [
@@ -4954,16 +4964,6 @@ export default class MetamaskController extends EventEmitter {
         endApprovalFlow: this.approvalController.endFlow.bind(
           this.approvalController,
         ),
-        setApprovalFlowLoadingText:
-          this.approvalController.setFlowLoadingText.bind(
-            this.approvalController,
-          ),
-        showApprovalSuccess: this.approvalController.success.bind(
-          this.approvalController,
-        ),
-        showApprovalError: this.approvalController.error.bind(
-          this.approvalController,
-        ),
         sendMetrics: this.metaMetricsController.trackEvent.bind(
           this.metaMetricsController,
         ),
@@ -5025,18 +5025,11 @@ export default class MetamaskController extends EventEmitter {
             this.networkController,
           ),
         findNetworkConfigurationBy: this.findNetworkConfigurationBy.bind(this),
-        getNetworkClientIdForDomain:
-          this.selectedNetworkController.getNetworkClientIdForDomain.bind(
-            this.selectedNetworkController,
-          ),
         setNetworkClientIdForDomain:
           this.selectedNetworkController.setNetworkClientIdForDomain.bind(
             this.selectedNetworkController,
           ),
 
-        getUseRequestQueue: this.preferencesController.getUseRequestQueue.bind(
-          this.preferencesController,
-        ),
         getProviderConfig: () => this.networkController.state.providerConfig,
         setProviderType: (type) => {
           return this.networkController.setProviderType(type);
@@ -5299,8 +5292,12 @@ export default class MetamaskController extends EventEmitter {
 
     Object.keys(this.connections).forEach((origin) => {
       Object.values(this.connections[origin]).forEach(async (conn) => {
-        if (conn.engine) {
-          conn.engine.emit('notification', await getPayload(origin));
+        try {
+          if (conn.engine) {
+            conn.engine.emit('notification', await getPayload(origin));
+          }
+        } catch (err) {
+          console.error(err);
         }
       });
     });
@@ -5326,8 +5323,6 @@ export default class MetamaskController extends EventEmitter {
       return;
     }
 
-    // Ensure preferences + identities controller know about all addresses
-    this.preferencesController.syncAddresses(addresses);
     this.accountTracker.syncWithAddresses(addresses);
   }
 
@@ -5564,6 +5559,14 @@ export default class MetamaskController extends EventEmitter {
       getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),
       getTransaction: (id) =>
         this.txController.state.transactions.find((tx) => tx.id === id),
+      getIsSmartTransaction: () => {
+        return getIsSmartTransaction(this._getMetaMaskState());
+      },
+      getSmartTransactionByMinedTxHash: (txHash) => {
+        return this.smartTransactionsController.getSmartTransactionByMinedTxHash(
+          txHash,
+        );
+      },
     };
     return {
       ...controllerActions,
@@ -5579,6 +5582,17 @@ export default class MetamaskController extends EventEmitter {
     };
   }
 
+  toggleExternalServices(useExternal) {
+    this.preferencesController.toggleExternalServices(useExternal);
+    if (useExternal) {
+      this.tokenDetectionController.enable();
+      this.gasFeeController.enableNonRPCGasFeeApis();
+    } else {
+      this.tokenDetectionController.disable();
+      this.gasFeeController.disableNonRPCGasFeeApis();
+    }
+  }
+
   //=============================================================================
   // CONFIG
   //=============================================================================
@@ -5658,6 +5672,7 @@ export default class MetamaskController extends EventEmitter {
   onClientClosed() {
     try {
       this.gasFeeController.stopAllPolling();
+      this.currencyRateController.stopAllPolling();
       this.appStateController.clearPollingTokens();
     } catch (error) {
       console.error(error);
@@ -5677,6 +5692,7 @@ export default class MetamaskController extends EventEmitter {
       this.appStateController.store.getState()[appStatePollingTokenType];
     pollingTokensToDisconnect.forEach((pollingToken) => {
       this.gasFeeController.stopPollingByPollingToken(pollingToken);
+      this.currencyRateController.stopPollingByPollingToken(pollingToken);
       this.appStateController.removePollingToken(
         pollingToken,
         appStatePollingTokenType,
@@ -5837,16 +5853,16 @@ export default class MetamaskController extends EventEmitter {
     this.permissionLogController.updateAccountsHistory(origin, newAccounts);
   }
 
-  _notifyChainChange() {
+  async _notifyChainChange() {
     if (this.preferencesController.getUseRequestQueue()) {
-      this.notifyAllConnections((origin) => ({
+      this.notifyAllConnections(async (origin) => ({
         method: NOTIFICATION_NAMES.chainChanged,
-        params: this.getProviderNetworkState(origin),
+        params: await this.getProviderNetworkState(origin),
       }));
     } else {
       this.notifyAllConnections({
         method: NOTIFICATION_NAMES.chainChanged,
-        params: this.getProviderNetworkState(),
+        params: await this.getProviderNetworkState(),
       });
     }
   }
@@ -6006,10 +6022,34 @@ export default class MetamaskController extends EventEmitter {
 
     this.controllerMessenger.publish(
       'TransactionController:transactionStatusUpdated',
-      { updatedTransactionMeta },
+      { transactionMeta: updatedTransactionMeta },
     );
   }
 
+  _publishSmartTransactionHook(transactionMeta) {
+    const state = this._getMetaMaskState();
+    const isSmartTransaction = getIsSmartTransaction(state);
+    if (!isSmartTransaction) {
+      // Will cause TransactionController to publish to the RPC provider as normal.
+      return { transactionHash: undefined };
+    }
+    const featureFlags = getFeatureFlagsByChainId(state);
+    return submitSmartTransactionHook({
+      transactionMeta,
+      transactionController: this.txController,
+      smartTransactionsController: this.smartTransactionsController,
+      controllerMessenger: this.controllerMessenger,
+      isSmartTransaction,
+      featureFlags,
+    });
+  }
+
+  _getMetaMaskState() {
+    return {
+      metamask: this.getState(),
+    };
+  }
+
   async #onPreferencesControllerStateChange(currentState, previousState) {
     const { currentLocale } = currentState;
     const { chainId } = this.networkController.state.providerConfig;
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 749d3ce66e70..a879f3f61add 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -31,7 +31,7 @@ import { flushPromises } from '../../test/lib/timer-helpers';
 import { deferredPromise } from './lib/util';
 import MetaMaskController from './metamask-controller';
 
-const { Ganache } = require('../../test/e2e/ganache');
+const { Ganache } = require('../../test/e2e/seeder/ganache');
 
 const ganacheServer = new Ganache();
 
@@ -83,8 +83,15 @@ const createLoggerMiddlewareMock = () => (req, res, next) => {
   }
   next();
 };
-
 jest.mock('./lib/createLoggerMiddleware', () => createLoggerMiddlewareMock);
+
+const rpcMethodMiddlewareMock = {
+  createMethodMiddleware: () => (_req, _res, next, _end) => {
+    next();
+  },
+};
+jest.mock('./lib/rpc-method-middleware', () => rpcMethodMiddlewareMock);
+
 jest.mock(
   './controllers/preferences',
   () =>
@@ -519,7 +526,6 @@ describe('MetaMaskController', () => {
 
     describe('#createNewVaultAndKeychain', () => {
       it('can only create new vault on keyringController once', async () => {
-        jest.spyOn(metamaskController, 'selectFirstAccount').mockReturnValue();
         const password = 'a-fake-password';
 
         const vault1 = await metamaskController.createNewVaultAndKeychain(
@@ -695,47 +701,6 @@ describe('MetaMaskController', () => {
       });
     });
 
-    describe('#selectFirstAccount', () => {
-      let identities;
-
-      beforeEach(async () => {
-        await metamaskController.keyringController.createNewVaultAndRestore(
-          'password',
-          TEST_SEED,
-        );
-        await metamaskController.addNewAccount(1);
-        await metamaskController.addNewAccount(2);
-
-        identities = {
-          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
-            TEST_ADDRESS,
-            name: 'Account 1',
-          },
-          '0xc42edfcc21ed14dda456aa0756c153f7985d8813': {
-            TEST_ADDRESS_2,
-            name: 'Account 2',
-          },
-        };
-        metamaskController.preferencesController.store.updateState({
-          identities,
-        });
-        metamaskController.selectFirstAccount();
-      });
-
-      it('changes preferences controller select address', () => {
-        const preferenceControllerState =
-          metamaskController.preferencesController.store.getState();
-        expect(preferenceControllerState.selectedAddress).toStrictEqual(
-          TEST_ADDRESS,
-        );
-      });
-
-      it('changes metamask controller selected address', () => {
-        const metamaskState = metamaskController.getState();
-        expect(metamaskState.selectedAddress).toStrictEqual(TEST_ADDRESS);
-      });
-    });
-
     describe('connectHardware', () => {
       it('should throw if it receives an unknown device name', async () => {
         const result = metamaskController.connectHardware(
@@ -920,9 +885,6 @@ describe('MetaMaskController', () => {
           .mockResolvedValueOnce(['0x1'])
           .mockResolvedValueOnce(['0x2'])
           .mockResolvedValueOnce(['0x3']);
-        jest
-          .spyOn(metamaskController.preferencesController, 'setAddresses')
-          .mockReturnValue();
         jest
           .spyOn(metamaskController.preferencesController, 'setSelectedAddress')
           .mockReturnValue();
@@ -968,12 +930,6 @@ describe('MetaMaskController', () => {
         ).toHaveBeenCalledTimes(3);
       });
 
-      it('should call preferencesController.setAddresses', async () => {
-        expect(
-          metamaskController.preferencesController.setAddresses,
-        ).toHaveBeenCalledTimes(1);
-      });
-
       it('should call preferencesController.setSelectedAddress', async () => {
         expect(
           metamaskController.preferencesController.setSelectedAddress,
@@ -1033,15 +989,28 @@ describe('MetaMaskController', () => {
           .mockReturnValue({ address: selectedAddressMock });
 
         jest.spyOn(metamaskController.txController, 'wipeTransactions');
+        jest.spyOn(
+          metamaskController.smartTransactionsController,
+          'wipeSmartTransactions',
+        );
 
         await metamaskController.resetAccount();
 
         expect(
           metamaskController.txController.wipeTransactions,
         ).toHaveBeenCalledTimes(1);
+        expect(
+          metamaskController.smartTransactionsController.wipeSmartTransactions,
+        ).toHaveBeenCalledTimes(1);
         expect(
           metamaskController.txController.wipeTransactions,
-        ).toHaveBeenCalledWith(true, selectedAddressMock);
+        ).toHaveBeenCalledWith(false, selectedAddressMock);
+        expect(
+          metamaskController.smartTransactionsController.wipeSmartTransactions,
+        ).toHaveBeenCalledWith({
+          address: selectedAddressMock,
+          ignoreNetwork: false,
+        });
       });
     });
 
@@ -1269,9 +1238,6 @@ describe('MetaMaskController', () => {
 
     describe('#_onKeyringControllerUpdate', () => {
       it('should do nothing if there are no keyrings in state', async () => {
-        jest
-          .spyOn(metamaskController.preferencesController, 'syncAddresses')
-          .mockReturnValue();
         jest
           .spyOn(metamaskController.accountTracker, 'syncWithAddresses')
           .mockReturnValue();
@@ -1279,9 +1245,6 @@ describe('MetaMaskController', () => {
         const oldState = metamaskController.getState();
         await metamaskController._onKeyringControllerUpdate({ keyrings: [] });
 
-        expect(
-          metamaskController.preferencesController.syncAddresses,
-        ).not.toHaveBeenCalled();
         expect(
           metamaskController.accountTracker.syncWithAddresses,
         ).not.toHaveBeenCalled();
@@ -1289,9 +1252,6 @@ describe('MetaMaskController', () => {
       });
 
       it('should sync addresses if there are keyrings in state', async () => {
-        jest
-          .spyOn(metamaskController.preferencesController, 'syncAddresses')
-          .mockReturnValue();
         jest
           .spyOn(metamaskController.accountTracker, 'syncWithAddresses')
           .mockReturnValue();
@@ -1305,9 +1265,6 @@ describe('MetaMaskController', () => {
           ],
         });
 
-        expect(
-          metamaskController.preferencesController.syncAddresses,
-        ).toHaveBeenCalledWith(['0x1', '0x2']);
         expect(
           metamaskController.accountTracker.syncWithAddresses,
         ).toHaveBeenCalledWith(['0x1', '0x2']);
@@ -1315,9 +1272,6 @@ describe('MetaMaskController', () => {
       });
 
       it('should NOT update selected address if already unlocked', async () => {
-        jest
-          .spyOn(metamaskController.preferencesController, 'syncAddresses')
-          .mockReturnValue();
         jest
           .spyOn(metamaskController.accountTracker, 'syncWithAddresses')
           .mockReturnValue();
@@ -1332,9 +1286,6 @@ describe('MetaMaskController', () => {
           ],
         });
 
-        expect(
-          metamaskController.preferencesController.syncAddresses,
-        ).toHaveBeenCalledWith(['0x1', '0x2']);
         expect(
           metamaskController.accountTracker.syncWithAddresses,
         ).toHaveBeenCalledWith(['0x1', '0x2']);
diff --git a/app/scripts/migrations/081.ts b/app/scripts/migrations/081.ts
index 0162a43b6e49..aa7e48a8c9fa 100644
--- a/app/scripts/migrations/081.ts
+++ b/app/scripts/migrations/081.ts
@@ -91,7 +91,7 @@ function transformState(state: Record<string, unknown>) {
         // Adding the snap name to the wallet_snap permission's caveat value
         const snapId = permissionName.slice(snapPrefix.length);
         const caveat = (
-          (updatedPermissions.wallet_snap as Record<string, any>)
+          (updatedPermissions.wallet_snap as Record<string, unknown>)
             .caveats as unknown[]
         )[0];
 
diff --git a/app/scripts/migrations/095.ts b/app/scripts/migrations/095.ts
index 39128284e03f..6361bba388fc 100644
--- a/app/scripts/migrations/095.ts
+++ b/app/scripts/migrations/095.ts
@@ -35,7 +35,11 @@ function migrateData(state: Record<string, unknown>): void {
   removeIncomingTransactionsControllerState(state);
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function moveIncomingTransactions(state: Record<string, any>) {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const incomingTransactions: Record<string, any> =
     state.IncomingTransactionsController?.incomingTransactions || {};
 
@@ -46,6 +50,8 @@ function moveIncomingTransactions(state: Record<string, any>) {
   const transactions = state.TransactionController?.transactions || {};
 
   const updatedTransactions = Object.values(incomingTransactions).reduce(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (result: Record<string, any>, tx: any) => {
       result[tx.id] = tx;
       return result;
@@ -59,7 +65,11 @@ function moveIncomingTransactions(state: Record<string, any>) {
   };
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function generateLastFetchedBlockNumbers(state: Record<string, any>) {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const incomingTransactions: Record<string, any> =
     state.IncomingTransactionsController?.incomingTransactions || {};
 
diff --git a/app/scripts/migrations/096.ts b/app/scripts/migrations/096.ts
index 749956a726b2..b04b7613e008 100644
--- a/app/scripts/migrations/096.ts
+++ b/app/scripts/migrations/096.ts
@@ -4,6 +4,8 @@ import { CHAIN_IDS } from '../../../shared/constants/network';
 
 type VersionedData = {
   meta: { version: number };
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   data: Record<string, any>;
 };
 
@@ -34,6 +36,8 @@ export async function migrate(
 }
 
 type NetworkConfiguration = {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   chainId: Record<string, any>;
 };
 
@@ -48,10 +52,18 @@ function transformState(state: Record<string, unknown>) {
     return state;
   }
   const { PreferencesController, NetworkController } = state;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { featureFlags }: Record<string, any> = PreferencesController;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { showIncomingTransactions }: any = featureFlags;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { networkConfigurations }: Record<string, any> = NetworkController;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const addedNetwork: Record<string, any>[] =
     Object.values<NetworkConfiguration>(networkConfigurations).map(
       (network) => network.chainId,
@@ -63,6 +75,8 @@ function transformState(state: Record<string, unknown>) {
     CHAIN_IDS.SEPOLIA,
     CHAIN_IDS.LINEA_GOERLI,
   ];
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const allSavedNetworks: Record<string, any> = [
     ...mainNetworks,
     ...addedNetwork,
diff --git a/app/scripts/migrations/097.ts b/app/scripts/migrations/097.ts
index 9e99cf61b40a..56a11679449d 100644
--- a/app/scripts/migrations/097.ts
+++ b/app/scripts/migrations/097.ts
@@ -21,6 +21,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const transactionControllerState = state?.TransactionController || {};
   const transactions = transactionControllerState?.transactions || {};
diff --git a/app/scripts/migrations/098.ts b/app/scripts/migrations/098.ts
index 3085827b4c6a..2fe77148e052 100644
--- a/app/scripts/migrations/098.ts
+++ b/app/scripts/migrations/098.ts
@@ -25,6 +25,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const transactionControllerState = state?.TransactionController || {};
   const transactions = transactionControllerState?.transactions || {};
diff --git a/app/scripts/migrations/099.test.ts b/app/scripts/migrations/099.test.ts
index 1feba98e6fa3..3b98f4f72a26 100644
--- a/app/scripts/migrations/099.test.ts
+++ b/app/scripts/migrations/099.test.ts
@@ -72,6 +72,8 @@ describe('migration #99', () => {
 
     const newStorage = await migrate(oldStorage);
 
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const migratedTransactions = (newStorage.data.TransactionController as any)
       .transactions;
 
diff --git a/app/scripts/migrations/099.ts b/app/scripts/migrations/099.ts
index 9464d19a64df..38018c97919d 100644
--- a/app/scripts/migrations/099.ts
+++ b/app/scripts/migrations/099.ts
@@ -24,6 +24,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const transactionControllerState = state?.TransactionController || {};
   const transactions = transactionControllerState?.transactions || {};
@@ -33,6 +35,8 @@ function transformState(state: Record<string, any>) {
   }
 
   const newTxs = Object.keys(transactions).reduce(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (txs: { [key: string]: any }, oldTransactionId) => {
       // Clone the transaction
       const transaction = cloneDeep(transactions[oldTransactionId]);
diff --git a/app/scripts/migrations/100.ts b/app/scripts/migrations/100.ts
index c9b4a99afceb..89dbe0d5670d 100644
--- a/app/scripts/migrations/100.ts
+++ b/app/scripts/migrations/100.ts
@@ -25,6 +25,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const addressBook = state?.AddressBookController?.addressBook ?? {};
   const names = state?.NameController?.names?.ethereumAddress ?? {};
diff --git a/app/scripts/migrations/102.ts b/app/scripts/migrations/102.ts
index 820e67605251..a1fde4f27f7f 100644
--- a/app/scripts/migrations/102.ts
+++ b/app/scripts/migrations/102.ts
@@ -23,6 +23,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const transactionControllerState = state?.TransactionController || {};
   const transactions = transactionControllerState?.transactions || {};
@@ -32,6 +34,8 @@ function transformState(state: Record<string, any>) {
   }
 
   const newTxs = Object.keys(transactions).reduce(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (txs: { [key: string]: any }, txId) => {
       // Clone the transaction
       const transaction = cloneDeep(transactions[txId]);
diff --git a/app/scripts/migrations/104.ts b/app/scripts/migrations/104.ts
index 340d167ccd5f..38ab3c0f57c8 100644
--- a/app/scripts/migrations/104.ts
+++ b/app/scripts/migrations/104.ts
@@ -22,6 +22,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const transactionControllerState = state?.TransactionController;
 
@@ -32,6 +34,8 @@ function transformState(state: Record<string, any>) {
   const transactionsObject = transactionControllerState?.transactions || {};
 
   const transactionsArray = Object.values(transactionsObject).sort(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (a: any, b: any) => (a.time > b.time ? -1 : 1), // Descending
   );
 
diff --git a/app/scripts/migrations/105.test.ts b/app/scripts/migrations/105.test.ts
index c25659b641c9..a57c422c8992 100644
--- a/app/scripts/migrations/105.test.ts
+++ b/app/scripts/migrations/105.test.ts
@@ -73,7 +73,14 @@ function expectedInternalAccount(
       lastSelected: lastSelected ? expect.any(Number) : undefined,
     },
     options: {},
-    methods: [...Object.values(EthMethod)],
+    methods: [
+      EthMethod.Sign,
+      EthMethod.PersonalSign,
+      EthMethod.SignTransaction,
+      EthMethod.SignTypedDataV1,
+      EthMethod.SignTypedDataV3,
+      EthMethod.SignTypedDataV4,
+    ],
     type: 'eip155:eoa',
   };
 }
@@ -94,7 +101,7 @@ function createMockState(
 describe('migration #105', () => {
   it('updates the version metadata', async () => {
     const oldStorage = {
-      meta: { version: 103 },
+      meta: { version: 104 },
       data: createMockState(),
     };
 
@@ -108,7 +115,7 @@ describe('migration #105', () => {
       const oldData = createMockState();
 
       const oldStorage = {
-        meta: { version: 103 },
+        meta: { version: 104 },
         data: oldData,
       };
 
@@ -139,7 +146,7 @@ describe('migration #105', () => {
       const oldData = createMockState();
 
       const oldStorage = {
-        meta: { version: 103 },
+        meta: { version: 104 },
         data: oldData,
       };
 
@@ -151,7 +158,7 @@ describe('migration #105', () => {
             accounts: {
               [expectedUUID]: expectedInternalAccount(
                 MOCK_ADDRESS,
-                `Account 1`,
+                'Account 1',
               ),
             },
             selectedAccount: expectedUUID,
@@ -168,7 +175,7 @@ describe('migration #105', () => {
         ]),
       );
       const oldStorage = {
-        meta: { version: 103 },
+        meta: { version: 104 },
         data: oldData,
       };
       const newStorage = await migrate(oldStorage);
@@ -179,7 +186,7 @@ describe('migration #105', () => {
             accounts: {
               [expectedUUID]: expectedInternalAccount(
                 MOCK_ADDRESS,
-                `a random name`,
+                'a random name',
               ),
             },
             selectedAccount: expectedUUID,
@@ -198,7 +205,7 @@ describe('migration #105', () => {
       });
 
       const oldStorage = {
-        meta: { version: 103 },
+        meta: { version: 104 },
         data: oldData,
       };
 
@@ -210,11 +217,11 @@ describe('migration #105', () => {
             accounts: {
               [expectedUUID]: expectedInternalAccount(
                 MOCK_ADDRESS,
-                `Account 1`,
+                'Account 1',
               ),
               [expectedUUID2]: expectedInternalAccount(
                 MOCK_ADDRESS_2,
-                `Account 2`,
+                'Account 2',
               ),
             },
             selectedAccount: expectedUUID,
@@ -226,10 +233,14 @@ describe('migration #105', () => {
   });
 
   describe('createSelectedAccountForAccountsController', () => {
+    afterEach(() => {
+      jest.resetAllMocks();
+    });
+
     it('should select the same account as the selected address', async () => {
       const oldData = createMockState();
       const oldStorage = {
-        meta: { version: 103 },
+        meta: { version: 104 },
         data: oldData,
       };
       const newStorage = await migrate(oldStorage);
@@ -252,7 +263,7 @@ describe('migration #105', () => {
         },
       };
       const oldStorage = {
-        meta: { version: 103 },
+        meta: { version: 104 },
         data: oldData,
       };
       const newStorage = await migrate(oldStorage);
@@ -275,7 +286,7 @@ describe('migration #105', () => {
         },
       };
       const oldStorage = {
-        meta: { version: 103 },
+        meta: { version: 104 },
         data: oldData,
       };
       await migrate(oldStorage);
@@ -285,5 +296,41 @@ describe('migration #105', () => {
         new Error(`state.PreferencesController?.selectedAddress is undefined`),
       );
     });
+
+    it('recovers from invalid selectedAddress state', async () => {
+      const expectedUUID = addressToUUID(MOCK_ADDRESS);
+
+      const oldData = {
+        PreferencesController: {
+          identities: {
+            [MOCK_ADDRESS]: { name: 'Account 1', address: MOCK_ADDRESS },
+          },
+          selectedAddress: undefined,
+        },
+      };
+      const oldStorage = {
+        meta: { version: 104 },
+        data: oldData,
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual({
+        PreferencesController: expect.objectContaining({
+          selectedAddress: MOCK_ADDRESS,
+        }),
+        AccountsController: {
+          internalAccounts: {
+            accounts: {
+              [expectedUUID]: expectedInternalAccount(
+                MOCK_ADDRESS,
+                'Account 1',
+              ),
+            },
+            selectedAccount: expectedUUID,
+          },
+        },
+      });
+    });
   });
 });
diff --git a/app/scripts/migrations/105.ts b/app/scripts/migrations/105.ts
index 10be55e69e0a..8640d9c6c645 100644
--- a/app/scripts/migrations/105.ts
+++ b/app/scripts/migrations/105.ts
@@ -48,6 +48,22 @@ function migrateData(state: Record<string, unknown>): void {
   createSelectedAccountForAccountsController(state);
 }
 
+function findInternalAccountByAddress(
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  state: Record<string, any>,
+  address: string,
+): InternalAccount | undefined {
+  return Object.values<InternalAccount>(
+    state.AccountsController.internalAccounts.accounts,
+  ).find(
+    (account: InternalAccount) =>
+      account.address.toLowerCase() === address.toLowerCase(),
+  );
+}
+
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function createDefaultAccountsController(state: Record<string, any>) {
   state.AccountsController = {
     internalAccounts: {
@@ -58,6 +74,8 @@ function createDefaultAccountsController(state: Record<string, any>) {
 }
 
 function createInternalAccountsForAccountsController(
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   state: Record<string, any>,
 ) {
   const identities: {
@@ -89,7 +107,14 @@ function createInternalAccountsForAccountsController(
           type: 'HD Key Tree',
         },
       },
-      methods: [...Object.values(EthMethod)],
+      methods: [
+        EthMethod.Sign,
+        EthMethod.PersonalSign,
+        EthMethod.SignTransaction,
+        EthMethod.SignTypedDataV1,
+        EthMethod.SignTypedDataV3,
+        EthMethod.SignTypedDataV4,
+      ],
       type: EthAccountType.Eoa,
     };
   });
@@ -97,10 +122,23 @@ function createInternalAccountsForAccountsController(
   state.AccountsController.internalAccounts.accounts = accounts;
 }
 
+function getFirstAddress(
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  state: Record<string, any>,
+) {
+  const [firstAddress] = Object.keys(
+    state.PreferencesController?.identities || {},
+  );
+  return firstAddress;
+}
+
 function createSelectedAccountForAccountsController(
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   state: Record<string, any>,
 ) {
-  const selectedAddress = state.PreferencesController?.selectedAddress;
+  let selectedAddress = state.PreferencesController?.selectedAddress;
 
   if (typeof selectedAddress !== 'string') {
     global.sentry?.captureException?.(
@@ -108,18 +146,18 @@ function createSelectedAccountForAccountsController(
         `state.PreferencesController?.selectedAddress is ${selectedAddress}`,
       ),
     );
-  }
 
-  const selectedAccount = Object.values<InternalAccount>(
-    state.AccountsController.internalAccounts.accounts,
-  ).find((account: InternalAccount) => {
-    return account.address.toLowerCase() === selectedAddress.toLowerCase();
-  }) as InternalAccount;
+    // Get the first account if selectedAddress is not a string
+    selectedAddress = getFirstAddress(state);
+  }
 
+  const selectedAccount = findInternalAccountByAddress(state, selectedAddress);
   if (selectedAccount) {
+    // Required in case there was no address selected
+    state.PreferencesController.selectedAddress = selectedAccount.address;
     state.AccountsController.internalAccounts = {
       ...state.AccountsController.internalAccounts,
-      selectedAccount: selectedAccount.id ?? '',
+      selectedAccount: selectedAccount.id,
     };
   }
 }
diff --git a/app/scripts/migrations/108.ts b/app/scripts/migrations/108.ts
index 1ea75957b73a..4b12de5f9004 100644
--- a/app/scripts/migrations/108.ts
+++ b/app/scripts/migrations/108.ts
@@ -27,6 +27,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const addressBook = state?.AddressBookController?.addressBook ?? {};
   const names = state?.NameController?.names?.ethereumAddress ?? {};
diff --git a/app/scripts/migrations/109.ts b/app/scripts/migrations/109.ts
index 5c40b07d4b09..13e268b8e061 100644
--- a/app/scripts/migrations/109.ts
+++ b/app/scripts/migrations/109.ts
@@ -27,6 +27,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const identities: PreferencesControllerState['identities'] =
     state?.PreferencesController?.identities ?? {};
diff --git a/app/scripts/migrations/110.ts b/app/scripts/migrations/110.ts
index bc941ac87695..7a677ed8b9cd 100644
--- a/app/scripts/migrations/110.ts
+++ b/app/scripts/migrations/110.ts
@@ -35,6 +35,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   const NetworkController = state?.NetworkController || {};
   const provider = NetworkController?.providerConfig || {};
diff --git a/app/scripts/migrations/111.ts b/app/scripts/migrations/111.ts
index a45c24fa168f..1a06e655cabb 100644
--- a/app/scripts/migrations/111.ts
+++ b/app/scripts/migrations/111.ts
@@ -28,6 +28,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   if (!hasProperty(state, 'SelectedNetworkController')) {
     return state;
diff --git a/app/scripts/migrations/112.ts b/app/scripts/migrations/112.ts
index 6313462be199..519be68c9ca3 100644
--- a/app/scripts/migrations/112.ts
+++ b/app/scripts/migrations/112.ts
@@ -26,6 +26,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   if (!hasProperty(state, 'SelectedNetworkController')) {
     return state;
diff --git a/app/scripts/migrations/114.ts b/app/scripts/migrations/114.ts
index 2288dc84d612..bed9c70a8850 100644
--- a/app/scripts/migrations/114.ts
+++ b/app/scripts/migrations/114.ts
@@ -26,6 +26,8 @@ export async function migrate(
   return versionedData;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function transformState(state: Record<string, any>) {
   if (!hasProperty(state, 'PreferencesController')) {
     return state;
diff --git a/app/scripts/migrations/115.test.ts b/app/scripts/migrations/115.test.ts
new file mode 100644
index 000000000000..19599c42320d
--- /dev/null
+++ b/app/scripts/migrations/115.test.ts
@@ -0,0 +1,194 @@
+import { NetworkType } from '@metamask/controller-utils';
+import {
+  CHAIN_IDS,
+  CHAIN_ID_TO_RPC_URL_MAP,
+  LINEA_SEPOLIA_DISPLAY_NAME,
+  NETWORK_TYPES,
+  TEST_NETWORK_TICKER_MAP,
+} from '../../../shared/constants/network';
+import { migrate, version } from './115';
+
+const oldVersion = 114;
+
+const ethereumProviderConfig = {
+  chainId: '0x1',
+  rpcPrefs: {
+    blockExplorerUrl: 'https://etherscan.io',
+  },
+  ticker: 'ETH',
+  type: 'mainnet',
+};
+
+const ethereumNetworksMetadata = {
+  mainnet: {
+    EIPS: {
+      '1559': true,
+    },
+    status: 'available',
+  },
+};
+const ethereumOldState = {
+  CurrencyController: {
+    currencyRates: {
+      ETH: {
+        conversionDate: 1708532473.416,
+        conversionRate: 2918.02,
+        usdConversionRate: 2918.02,
+      },
+      GoerliETH: {
+        conversionDate: 1708532466.732,
+        conversionRate: 2918.02,
+        usdConversionRate: 2918.02,
+      },
+    },
+    currentCurrency: 'usd',
+  },
+  NetworkController: {
+    networkConfigurations: {},
+    networksMetadata: ethereumNetworksMetadata,
+    providerConfig: ethereumProviderConfig,
+    selectedNetworkClientId: 'mainnet',
+  },
+};
+
+const lineaGoerliState = {
+  NetworkController: {
+    networkConfigurations: {},
+    networksMetadata: {
+      'linea-goerli': {
+        EIPS: {
+          '1559': true,
+        },
+        status: 'available',
+      },
+    },
+    providerConfig: {
+      chainId: CHAIN_IDS.LINEA_GOERLI,
+      rpcPrefs: {},
+      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
+      type: NETWORK_TYPES.LINEA_GOERLI,
+    },
+    selectedNetworkClientId: NETWORK_TYPES.LINEA_GOERLI,
+  },
+};
+
+describe('migration #115', () => {
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('does nothing if no preferences state', async () => {
+    const oldState = {
+      OtherController: {},
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('Should return state if chainId is not linea-goerli', async () => {
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: ethereumOldState,
+    });
+
+    expect(transformedState.data).toEqual(ethereumOldState);
+  });
+
+  it('Should return state if there is no NetworkController in state', async () => {
+    const { NetworkController, ...state } = ethereumOldState;
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: state,
+    });
+
+    expect(transformedState.data).toEqual(state);
+  });
+
+  it('Should return state if there is no provider in NetworkController', async () => {
+    const state = {
+      ...ethereumOldState,
+      NetworkController: {},
+    };
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: state,
+    });
+
+    expect(transformedState.data).toEqual(state);
+  });
+
+  it('Should return state if there is no chainId in provider in NetworkController', async () => {
+    const state = {
+      ...ethereumOldState,
+      NetworkController: {
+        providerConfig: {},
+      },
+    };
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: state,
+    });
+
+    expect(transformedState.data).toEqual(state);
+  });
+
+  it('Should return state if chainId is not linea-goerli', async () => {
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: ethereumOldState,
+    });
+
+    expect(transformedState.data).toEqual(ethereumOldState);
+  });
+
+  it('Should update NetworkController to Linea Sepolia if chainId is on Linea Goerli', async () => {
+    const expectedNetworkControllerState = {
+      networkConfigurations: {},
+      networksMetadata: {
+        'linea-sepolia': {
+          EIPS: {
+            '1559': true,
+          },
+          status: 'available',
+        },
+        'linea-goerli': {
+          EIPS: {
+            '1559': true,
+          },
+          status: 'available',
+        },
+      },
+      providerConfig: {
+        type: NetworkType['linea-sepolia'],
+        rpcPrefs: {},
+        chainId: CHAIN_IDS.LINEA_SEPOLIA,
+        nickname: LINEA_SEPOLIA_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
+        providerType: NETWORK_TYPES.LINEA_SEPOLIA,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
+        id: NETWORK_TYPES.LINEA_SEPOLIA,
+      },
+      selectedNetworkClientId: 'linea-sepolia',
+    };
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: lineaGoerliState,
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: expectedNetworkControllerState,
+    });
+  });
+});
diff --git a/app/scripts/migrations/115.ts b/app/scripts/migrations/115.ts
new file mode 100644
index 000000000000..d0d582ab6d04
--- /dev/null
+++ b/app/scripts/migrations/115.ts
@@ -0,0 +1,81 @@
+import { cloneDeep, isObject } from 'lodash';
+import { NetworkType } from '@metamask/controller-utils';
+import { hasProperty } from '@metamask/utils';
+import { NetworkStatus } from '@metamask/network-controller';
+import {
+  CHAIN_IDS,
+  CHAIN_ID_TO_RPC_URL_MAP,
+  NETWORK_TYPES,
+  TEST_NETWORK_TICKER_MAP,
+  LINEA_SEPOLIA_DISPLAY_NAME,
+} from '../../../shared/constants/network';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 115;
+
+/**
+ * Migrates the user network to Linea Sepolia if the user is on Linea Goerli network.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function transformState(state: Record<string, any>) {
+  const NetworkController = state?.NetworkController || {};
+  const provider = NetworkController?.providerConfig || {};
+
+  if (provider?.chainId !== CHAIN_IDS.LINEA_GOERLI) {
+    return state;
+  }
+  const networkControllerState = state.NetworkController;
+
+  if (
+    hasProperty(state, 'NetworkController') &&
+    isObject(state.NetworkController) &&
+    hasProperty(state.NetworkController, 'providerConfig') &&
+    isObject(state.NetworkController.providerConfig) &&
+    hasProperty(state.NetworkController.providerConfig, 'chainId') &&
+    state.NetworkController.providerConfig.chainId === CHAIN_IDS.LINEA_GOERLI
+  ) {
+    networkControllerState.providerConfig = {
+      type: NetworkType['linea-sepolia'],
+      rpcPrefs: {},
+      chainId: CHAIN_IDS.LINEA_SEPOLIA,
+      nickname: LINEA_SEPOLIA_DISPLAY_NAME,
+      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
+      providerType: NETWORK_TYPES.LINEA_SEPOLIA,
+      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
+      id: NETWORK_TYPES.LINEA_SEPOLIA,
+    };
+    networkControllerState.selectedNetworkClientId =
+      NETWORK_TYPES.LINEA_SEPOLIA;
+    networkControllerState.networksMetadata = {
+      ...networkControllerState.networksMetadata,
+      'linea-sepolia': {
+        EIPS: {
+          '1559': true,
+        },
+        status: NetworkStatus.Available,
+      },
+    };
+  }
+  return {
+    ...state,
+    NetworkController: networkControllerState,
+  };
+}
diff --git a/app/scripts/migrations/116.test.ts b/app/scripts/migrations/116.test.ts
new file mode 100644
index 000000000000..6b3d8095dbd8
--- /dev/null
+++ b/app/scripts/migrations/116.test.ts
@@ -0,0 +1,66 @@
+import { migrate, version } from './116';
+
+const oldVersion = 115;
+
+describe('migration #79', () => {
+  it('should update the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('should remove the "showProductTour"', async () => {
+    const oldStorage = {
+      meta: {
+        version: oldVersion,
+      },
+      data: {
+        AppStateController: {
+          showProductTour: false,
+          bar: 'baz',
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 116,
+      },
+      data: {
+        AppStateController: {
+          bar: 'baz',
+        },
+      },
+    });
+  });
+
+  it('should make no changes if "showProductTour" never existed', async () => {
+    const oldStorage = {
+      meta: {
+        version: oldVersion,
+      },
+      data: {
+        AppStateController: {
+          bar: 'baz',
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 116,
+      },
+      data: {
+        AppStateController: {
+          bar: 'baz',
+        },
+      },
+    });
+  });
+});
diff --git a/app/scripts/migrations/116.ts b/app/scripts/migrations/116.ts
new file mode 100644
index 000000000000..69dc8ba3bf1c
--- /dev/null
+++ b/app/scripts/migrations/116.ts
@@ -0,0 +1,41 @@
+import { cloneDeep, isObject } from 'lodash';
+import { hasProperty } from '@metamask/utils';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 116;
+
+/**
+ * As we have removed Product tour from Home Page so this migration is to remove showProductTour from AppState
+ *
+ * @param originalVersionedData
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function transformState(state: Record<string, any>) {
+  const AppStateController = state?.AppStateController || {};
+
+  if (
+    hasProperty(state, 'AppStateController') &&
+    isObject(state.AppStateController) &&
+    hasProperty(state.AppStateController, 'showProductTour') &&
+    state.AppStateController.showProductTour !== undefined
+  ) {
+    delete AppStateController.showProductTour;
+  }
+
+  return {
+    ...state,
+    AppStateController,
+  };
+}
diff --git a/app/scripts/migrations/117.test.ts b/app/scripts/migrations/117.test.ts
new file mode 100644
index 000000000000..234dd60f90bc
--- /dev/null
+++ b/app/scripts/migrations/117.test.ts
@@ -0,0 +1,104 @@
+import { TransactionStatus } from '@metamask/transaction-controller';
+import { migrate, version, StuckTransactionError, TARGET_DATE } from './117';
+
+const oldVersion = 116;
+
+const TRANSACTIONS_MOCK = [
+  { id: 'tx1', time: TARGET_DATE - 1000, status: 'approved' }, // Before target date, should be marked as failed
+  { id: 'tx2', time: TARGET_DATE + 1000, status: 'approved' }, // After target date, should remain unchanged
+  { id: 'tx3', time: TARGET_DATE - 1000, status: 'signed' }, // Before target date, should be marked as failed
+  { id: 'tx4', time: TARGET_DATE - 1000, status: 'confirmed' }, // Before target date but not approved/signed, should remain unchanged
+];
+
+describe('migration #117', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: {
+        version: oldVersion,
+      },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('handles missing TransactionController', async () => {
+    const oldState = {
+      OtherController: {},
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('handles empty transactions', async () => {
+    const oldState = {
+      TransactionController: {
+        transactions: [],
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('handles missing state', async () => {
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: {},
+    });
+
+    expect(transformedState.data).toEqual({});
+  });
+
+  it('marks the transactions as failed before December 8, 2023, if they are approved or signed', async () => {
+    const oldState = {
+      TransactionController: {
+        transactions: TRANSACTIONS_MOCK,
+      },
+    };
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: oldState,
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    // Expected modifications to the transactions based on the migration logic
+    const expectedTransactions = [
+      {
+        ...TRANSACTIONS_MOCK[0], // Assuming tx1 is the first element
+        status: TransactionStatus.failed,
+        error: StuckTransactionError,
+      },
+      TRANSACTIONS_MOCK[1], // Assuming tx2 remains unchanged
+      {
+        ...TRANSACTIONS_MOCK[2], // Assuming tx3 is the third element
+        status: TransactionStatus.failed,
+        error: StuckTransactionError,
+      },
+      TRANSACTIONS_MOCK[3], // Assuming tx4 and any others remain unchanged
+      // Add more transactions if there are more than four in TRANSACTIONS_MOCK
+    ];
+
+    expect(newStorage.data).toEqual({
+      TransactionController: {
+        transactions: expectedTransactions,
+      },
+    });
+  });
+});
diff --git a/app/scripts/migrations/117.ts b/app/scripts/migrations/117.ts
new file mode 100644
index 000000000000..a84cdbbb32b3
--- /dev/null
+++ b/app/scripts/migrations/117.ts
@@ -0,0 +1,62 @@
+import { cloneDeep } from 'lodash';
+import {
+  TransactionMeta,
+  TransactionStatus,
+  TransactionError,
+} from '@metamask/transaction-controller';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 117;
+
+// Target date is December 8, 2023 - 00:00:00 UTC
+export const TARGET_DATE = new Date('2023-12-08T00:00:00Z').getTime();
+
+const STUCK_STATES = [TransactionStatus.approved, TransactionStatus.signed];
+
+type FailedTransactionMeta = TransactionMeta & {
+  status: TransactionStatus.failed;
+  error: TransactionError;
+};
+
+export const StuckTransactionError = {
+  name: 'StuckTransactionDueToStatus',
+  message: 'Transaction is stuck due to status - migration 116',
+};
+
+/**
+ * This migration sets the `status` to `failed` for all transactions created before December 8, 2023 that are still `approved` or `signed`.
+ *
+ * @param originalVersionedData
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function transformState(state: Record<string, any>) {
+  const transactions: TransactionMeta[] =
+    state?.TransactionController?.transactions ?? [];
+
+  for (const transaction of transactions) {
+    if (
+      transaction.time < TARGET_DATE &&
+      STUCK_STATES.includes(transaction.status)
+    ) {
+      transaction.status = TransactionStatus.failed;
+
+      const failedTransaction = transaction as FailedTransactionMeta;
+
+      failedTransaction.error = StuckTransactionError;
+    }
+  }
+}
diff --git a/app/scripts/migrations/118.test.ts b/app/scripts/migrations/118.test.ts
new file mode 100644
index 000000000000..5c8db790961f
--- /dev/null
+++ b/app/scripts/migrations/118.test.ts
@@ -0,0 +1,131 @@
+import { migrate, version } from './118';
+
+const sentryCaptureExceptionMock = jest.fn();
+
+global.sentry = {
+  captureException: sentryCaptureExceptionMock,
+};
+
+describe('migration #118', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: 117 },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('does nothing if SelectedNetworkController is not present', async () => {
+    const oldState = {
+      OtherController: {},
+    };
+
+    const transformedState = await migrate({
+      meta: { version: 117 },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('removes domains with npm: or local: prefixes and preserves other domains', async () => {
+    const oldState = {
+      SelectedNetworkController: {
+        domains: {
+          'npm:package': 'network1',
+          'local:development': 'network2',
+          otherDomain: 'network3',
+        },
+      },
+    };
+
+    const expectedState = {
+      SelectedNetworkController: {
+        domains: {
+          otherDomain: 'network3',
+        },
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: 117 },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(expectedState);
+  });
+
+  it('keeps the domains unchanged if there are no npm: or local: prefixes', async () => {
+    const oldState = {
+      SelectedNetworkController: {
+        domains: {
+          someDomain: 'network1',
+          anotherDomain: 'network2',
+        },
+      },
+    };
+
+    const expectedState = {
+      SelectedNetworkController: {
+        domains: {
+          someDomain: 'network1',
+          anotherDomain: 'network2',
+        },
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: 117 },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(expectedState);
+  });
+
+  it('should capture an exception if SelectedNetworkController is in state but is not an object', async () => {
+    const oldData = {
+      SelectedNetworkController: 'not an object',
+    };
+    const oldStorage = {
+      meta: {
+        version: 117,
+      },
+      data: oldData,
+    };
+
+    await migrate(oldStorage);
+
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledTimes(1);
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+      new Error('SelectedNetworkController is not an object.'),
+    );
+  });
+
+  it('should capture an exception if SelectedNetworkController has domains but it is not an object', async () => {
+    const oldData = {
+      SelectedNetworkController: {
+        domains: 'not an object',
+      },
+    };
+    const oldStorage = {
+      meta: {
+        version: 117,
+      },
+      data: oldData,
+    };
+
+    await migrate(oldStorage);
+
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledTimes(1);
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+      new Error('Domains state is not an object.'),
+    );
+  });
+});
diff --git a/app/scripts/migrations/118.ts b/app/scripts/migrations/118.ts
new file mode 100644
index 000000000000..518b6f661e1a
--- /dev/null
+++ b/app/scripts/migrations/118.ts
@@ -0,0 +1,75 @@
+import { cloneDeep } from 'lodash';
+import log from 'loglevel';
+import { hasProperty, isObject } from '@metamask/utils';
+
+export const version = 118;
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+/**
+ * Removes all Snaps domains (identified as starting with 'npm:' or 'local:') from the SelectedNetworkController's domains state.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+/**
+ * Removes all domains starting with 'npm:' or 'local:' from the SelectedNetworkController's domains state.
+ *
+ * @param state - The entire state object of the MetaMask extension.
+ */
+function transformState(state: Record<string, unknown>) {
+  const selectedNetworkControllerState = state.SelectedNetworkController;
+  if (!selectedNetworkControllerState) {
+    log.warn('Skipping migration. SelectedNetworkController state not found.');
+    return;
+  }
+
+  if (!isObject(selectedNetworkControllerState)) {
+    global.sentry?.captureException?.(
+      new Error('SelectedNetworkController is not an object.'),
+    );
+    return;
+  }
+
+  if (!hasProperty(selectedNetworkControllerState, 'domains')) {
+    global.sentry?.captureException?.(
+      new Error('Domains key is missing in SelectedNetworkController state.'),
+    );
+    return;
+  }
+
+  if (!isObject(selectedNetworkControllerState.domains)) {
+    global.sentry?.captureException?.(
+      new Error('Domains state is not an object.'),
+    );
+    return;
+  }
+
+  const { domains } = selectedNetworkControllerState;
+  const filteredDomains = Object.keys(domains).reduce<Record<string, unknown>>(
+    (acc, domain) => {
+      if (!domain.startsWith('npm:') && !domain.startsWith('local:')) {
+        acc[domain] = domains[domain];
+      }
+      return acc;
+    },
+    {},
+  );
+
+  selectedNetworkControllerState.domains = filteredDomains;
+}
diff --git a/app/scripts/migrations/119.test.ts b/app/scripts/migrations/119.test.ts
new file mode 100644
index 000000000000..40d374c8001a
--- /dev/null
+++ b/app/scripts/migrations/119.test.ts
@@ -0,0 +1,66 @@
+import { migrate, version } from './119';
+
+const oldVersion = 118;
+
+describe('migration #119', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: {
+        version: oldVersion,
+      },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  describe('set useRequestQueue to true in PreferencesController', () => {
+    it('sets useRequestQueue to true', async () => {
+      const oldStorage = {
+        PreferencesController: {
+          useRequestQueue: false,
+        },
+      };
+
+      const expectedState = {
+        PreferencesController: {
+          useRequestQueue: true,
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: oldStorage,
+      });
+
+      expect(transformedState.data).toEqual(expectedState);
+    });
+
+    it('should not update useRequestQueue value if it was set true in initial state', async () => {
+      const oldStorage = {
+        PreferencesController: {
+          useRequestQueue: true,
+        },
+      };
+
+      const expectedState = {
+        PreferencesController: {
+          useRequestQueue: true,
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: oldStorage,
+      });
+
+      expect(transformedState.data).toEqual(expectedState);
+    });
+  });
+});
diff --git a/app/scripts/migrations/119.ts b/app/scripts/migrations/119.ts
new file mode 100644
index 000000000000..cacd97f28059
--- /dev/null
+++ b/app/scripts/migrations/119.ts
@@ -0,0 +1,52 @@
+import { cloneDeep } from 'lodash';
+import { hasProperty, isObject } from '@metamask/utils';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 119;
+
+/**
+ * This migration sets preference useRequestQueue to true
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+// TODO: Replace `any` with specific type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function transformState(state: Record<string, any>) {
+  if (!hasProperty(state, 'PreferencesController')) {
+    return state;
+  }
+
+  if (!isObject(state.PreferencesController)) {
+    const controllerType = typeof state.PreferencesController;
+    global.sentry?.captureException?.(
+      new Error(`state.PreferencesController is type: ${controllerType}`),
+    );
+    state.PreferencesController = {};
+  }
+
+  if (
+    state.PreferencesController.useRequestQueue === false ||
+    state.PreferencesController.useRequestQueue === undefined
+  ) {
+    state.PreferencesController.useRequestQueue = true;
+  }
+
+  return state;
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 85c95bbb1695..bcd4fef72698 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -125,6 +125,11 @@ const migrations = [
   require('./112'),
   require('./113'),
   require('./114'),
+  require('./115'),
+  require('./116'),
+  require('./117'),
+  require('./118'),
+  require('./119'),
 ];
 
 export default migrations;
diff --git a/app/scripts/snaps/preinstalled-snaps.ts b/app/scripts/snaps/preinstalled-snaps.ts
new file mode 100644
index 000000000000..0a014c350c21
--- /dev/null
+++ b/app/scripts/snaps/preinstalled-snaps.ts
@@ -0,0 +1,8 @@
+import type { PreinstalledSnap } from '@metamask/snaps-controllers';
+import MessageSigningSnap from '@metamask/message-signing-snap/dist/preinstalled-snap.json';
+
+const PREINSTALLED_SNAPS: readonly PreinstalledSnap[] = Object.freeze([
+  MessageSigningSnap as PreinstalledSnap,
+]);
+
+export default PREINSTALLED_SNAPS;
diff --git a/app/trezor-usb-permissions.html b/app/trezor-usb-permissions.html
index b3c6ce72b11c..8c92552cfa02 100644
--- a/app/trezor-usb-permissions.html
+++ b/app/trezor-usb-permissions.html
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
-  <script src="./snow.js" type="text/javascript"  charset="utf-8"></script>
-  <script src="./use-snow.js" type="text/javascript" charset="utf-8"></script>
     <meta charset="UTF-8" />
+  <% if (it.shouldIncludeSnow) { %>
+  <script src="./scripts/snow.js"></script>
+  <script src="./scripts/use-snow.js"></script>
+  <% } %>
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
     <title>TrezorConnect | Trezor</title>
@@ -31,5 +33,5 @@
 </head>
 <body>
     <iframe id="trezor-usb-permissions" src="https://connect.trezor.io/9/extension-permissions.html" allow="usb" frameborder="0" width="100%" height="100%"></iframe>
-    <script type="text/javascript" src="./vendor/trezor/usb-permissions.js"></script>
+    <script src="./vendor/trezor/usb-permissions.js"></script>
 </body>
diff --git a/builds.yml b/builds.yml
index bf949e39bc78..c70cdd6be3fa 100644
--- a/builds.yml
+++ b/builds.yml
@@ -27,7 +27,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.0.2/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
     # Main build uses the default browser manifest
     manifestOverrides: false
@@ -64,12 +64,13 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.0.2/index.html
       - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
       - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
       - SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://metamask.github.io/snaps-directory-staging/main/account-management
+      - EIP_4337_ENTRYPOINT: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789'
     isPrerelease: true
     manifestOverrides: ./app/build-types/flask/manifest/
     buildNameOverride: MetaMask Flask
@@ -85,7 +86,7 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.0.2/index.html
       - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
       - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
@@ -108,7 +109,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.0.2/index.html
       - MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default
       - SUPPORT_LINK: https://mmi-support.metamask.io/hc/en-us
       - SUPPORT_REQUEST_LINK: https://mmi-support.metamask.io/hc/en-us/requests/new
@@ -144,7 +145,6 @@ features:
     env:
       - BLOCKAID_FILE_CDN: static.cx.metamask.io/api/v1/confirmations/ppom
       - BLOCKAID_PUBLIC_KEY: 066ad3e8af5583385e312c156d238055215d5f25247c1e91055afa756cb98a88
-  conf-redesign:
   ###
   # Build Type code extensions. Things like different support links, warning pages, banners
   ###
@@ -192,12 +192,38 @@ env:
   # TODO(ritave): Move ManifestV3 into a feature?
   - ENABLE_MV3: false
   # These are exclusively used for MV3
+  - USE_SNOW
   - APPLY_LAVAMOAT
   - FILE_NAMES
 
   # This variable is read by Trezor's source and breaks build if not included
   - ASSET_PREFIX: null
 
+  - SENTRY_MMI_DSN: ''
+
+  ###
+  # Notifications Feature
+  ###
+  - AUTH_API: https://authentication.api.cx.metamask.io
+  - OIDC_API: https://oidc.api.cx.metamask.io
+  - OIDC_CLIENT_ID: 1132f10a-b4e5-4390-a5f2-d9c6022db564
+  - OIDC_GRANT_TYPE: urn:ietf:params:oauth:grant-type:jwt-bearer
+  - USER_STORAGE_API: https://user-storage.api.cx.metamask.io
+  - CONTENTFUL_ACCESS_SPACE_ID: null
+  - CONTENTFUL_ACCESS_TOKEN: null
+  - NOTIFICATIONS_SERVICE_URL: https://notification.api.cx.metamask.io
+  - TRIGGERS_SERVICE_URL: https://trigger.api.cx.metamask.io
+  - PUSH_NOTIFICATIONS_SERVICE_URL: https://push.api.cx.metamask.io
+  - VAPID_KEY: null
+  - FIREBASE_API_KEY: null
+  - FIREBASE_AUTH_DOMAIN: null
+  - FIREBASE_STORAGE_BUCKET: null
+  - FIREBASE_PROJECT_ID: null
+  - FIREBASE_MESSAGING_SENDER_ID: null
+  - FIREBASE_APP_ID: null
+  - FIREBASE_MEASUREMENT_ID: null
+  - __FIREBASE_DEFAULTS__: null
+
   ###
   # API keys to 3rd party services
   ###
@@ -222,6 +248,10 @@ env:
   # Variables that are modified with hardcoded code
   ###
 
+  # Used to enable confirmation redesigned pages
+  - ENABLE_CONFIRMATION_REDESIGN: ''
+  # Determines if feature flagged Settings Page - Developer Options should be used
+  - ENABLE_SETTINGS_PAGE_DEV_OPTIONS: false
   # Used for debugging changes to the phishing warning page.
   # Modified in <root>/development/build/scripts.js:@getPhishingWarningPageUrl
   - PHISHING_WARNING_PAGE_URL: null
@@ -263,6 +293,11 @@ env:
   - MULTICHAIN: ''
   # Determines if feature flagged Multichain Transactions should be used
   - TRANSACTION_MULTICHAIN: ''
+  # Enables use of test gas fee flow to debug gas fee estimation
+  - TEST_GAS_FEE_FLOWS: false
+
+    # Enables the notifications feature within the build:
+  - NOTIFICATIONS: ''
 
   ###
   # Meta variables
@@ -275,4 +310,4 @@ env:
   # Account Abstraction (EIP-4337)
   ###
 
-  - EIP_4337_ENTRYPOINT: null
+  - EIP_4337_ENTRYPOINT: null
\ No newline at end of file
diff --git a/development/build/index.js b/development/build/index.js
index cc89cb6ad1e6..fbd828993c82 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -26,7 +26,12 @@ const createScriptTasks = require('./scripts');
 const createStyleTasks = require('./styles');
 const createStaticAssetTasks = require('./static');
 const createEtcTasks = require('./etc');
-const { getBrowserVersionMap, getEnvironment } = require('./utils');
+const {
+  getBrowserVersionMap,
+  getEnvironment,
+  isDevBuild,
+  isTestBuild,
+} = require('./utils');
 const { getConfig } = require('./config');
 
 /* eslint-disable no-constant-condition, node/global-require */
@@ -190,6 +195,7 @@ async function defineAndRunBuildTasks() {
   const styleTasks = createStyleTasks({ livereload });
 
   const scriptTasks = createScriptTasks({
+    shouldIncludeSnow,
     applyLavaMoat,
     browserPlatforms,
     buildType,
@@ -380,8 +386,9 @@ testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
     platform,
   } = argv;
 
-  // Manually default this to `false` for dev builds only.
-  const shouldLintFenceFiles = lintFenceFiles ?? !/dev/iu.test(task);
+  // Manually default this to `false` for dev and test builds.
+  const shouldLintFenceFiles =
+    lintFenceFiles ?? (!isDevBuild(task) && !isTestBuild(task));
 
   const version = getVersion(buildType, buildVersion);
 
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 9e0ebd53715c..17c57807073d 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -4,7 +4,6 @@ const { callbackify } = require('util');
 const path = require('path');
 const { writeFileSync, readFileSync, unlinkSync } = require('fs');
 const EventEmitter = require('events');
-const assert = require('assert');
 const gulp = require('gulp');
 const watch = require('gulp-watch');
 const Vinyl = require('vinyl');
@@ -14,7 +13,7 @@ const log = require('fancy-log');
 const browserify = require('browserify');
 const watchify = require('watchify');
 const babelify = require('babelify');
-const brfs = require('brfs');
+
 const envify = require('loose-envify/custom');
 const sourcemaps = require('gulp-sourcemaps');
 const applySourceMap = require('vinyl-sourcemaps-apply');
@@ -30,9 +29,9 @@ const terser = require('terser');
 
 const bifyModuleGroups = require('bify-module-groups');
 
-const phishingWarningManifest = require('@metamask/phishing-warning/package.json');
 const { streamFlatMap } = require('../stream-flat-map');
-const { BUILD_TARGETS, ENVIRONMENT } = require('./constants');
+const { setEnvironmentVariables } = require('./set-environment-variables');
+const { BUILD_TARGETS } = require('./constants');
 const { getConfig } = require('./config');
 const {
   isDevBuild,
@@ -41,8 +40,6 @@ const {
   logError,
   wrapAgainstScuttling,
   getBuildName,
-  getBuildAppId,
-  getBuildIcon,
   makeSelfInjecting,
 } = require('./utils');
 
@@ -58,7 +55,7 @@ const {
 
 // map dist files to bag of needed native APIs against LM scuttling
 const scuttlingConfigBase = {
-  'sentry-install.js': {
+  'scripts/sentry-install.js': {
     // globals sentry need to function
     window: '',
     navigator: '',
@@ -96,128 +93,12 @@ const mv3ScuttlingConfig = { ...scuttlingConfigBase };
 
 const standardScuttlingConfig = {
   ...scuttlingConfigBase,
-  'sentry-install.js': {
-    ...scuttlingConfigBase['sentry-install.js'],
+  'scripts/sentry-install.js': {
+    ...scuttlingConfigBase['scripts/sentry-install.js'],
     document: '',
   },
 };
 
-/**
- * Get the appropriate Infura project ID.
- *
- * @param {object} options - The Infura project ID options.
- * @param {string} options.buildType - The current build type.
- * @param {ENVIRONMENT[keyof ENVIRONMENT]} options.environment - The build environment.
- * @param {boolean} options.testing - Whether this is a test build or not.
- * @param options.variables
- * @returns {string} The Infura project ID.
- */
-function getInfuraProjectId({ buildType, variables, environment, testing }) {
-  const EMPTY_PROJECT_ID = '00000000000000000000000000000000';
-  if (testing) {
-    return EMPTY_PROJECT_ID;
-  } else if (environment !== ENVIRONMENT.PRODUCTION) {
-    // Skip validation because this is unset on PRs from forks.
-    // For forks, return empty project ID if we don't have one.
-    if (
-      !variables.isDefined('INFURA_PROJECT_ID') &&
-      environment === ENVIRONMENT.PULL_REQUEST
-    ) {
-      return EMPTY_PROJECT_ID;
-    }
-    return variables.get('INFURA_PROJECT_ID');
-  }
-  /** @type {string|undefined} */
-  const infuraKeyReference = variables.get('INFURA_ENV_KEY_REF');
-  assert(
-    typeof infuraKeyReference === 'string' && infuraKeyReference.length > 0,
-    `Build type "${buildType}" has improperly set INFURA_ENV_KEY_REF in builds.yml. Current value: "${infuraKeyReference}"`,
-  );
-  /** @type {string|undefined} */
-  const infuraProjectId = variables.get(infuraKeyReference);
-  assert(
-    typeof infuraProjectId === 'string' && infuraProjectId.length > 0,
-    `Infura Project ID environmental variable "${infuraKeyReference}" is set improperly.`,
-  );
-  return infuraProjectId;
-}
-
-/**
- * Get the appropriate Segment write key.
- *
- * @param {object} options - The Segment write key options.
- * @param {string} options.buildType - The current build type.
- * @param {keyof ENVIRONMENT} options.environment - The current build environment.
- * @param {import('../lib/variables').Variables} options.variables - Object containing all variables that modify the build pipeline
- * @returns {string} The Segment write key.
- */
-function getSegmentWriteKey({ buildType, variables, environment }) {
-  if (environment !== ENVIRONMENT.PRODUCTION) {
-    // Skip validation because this is unset on PRs from forks, and isn't necessary for development builds.
-    return variables.get('SEGMENT_WRITE_KEY');
-  }
-
-  const segmentKeyReference = variables.get('SEGMENT_WRITE_KEY_REF');
-  assert(
-    typeof segmentKeyReference === 'string' && segmentKeyReference.length > 0,
-    `Build type "${buildType}" has improperly set SEGMENT_WRITE_KEY_REF in builds.yml. Current value: "${segmentKeyReference}"`,
-  );
-
-  const segmentWriteKey = variables.get(segmentKeyReference);
-  assert(
-    typeof segmentWriteKey === 'string' && segmentWriteKey.length > 0,
-    `Segment Write Key environmental variable "${segmentKeyReference}" is set improperly.`,
-  );
-  return segmentWriteKey;
-}
-
-/**
- * Get the URL for the phishing warning page, if it has been set.
- *
- * @param {object} options - The phishing warning page options.
- * @param {boolean} options.testing - Whether this is a test build or not.
- * @param {import('../lib/variables').Variables} options.variables - Object containing all variables that modify the build pipeline
- * @returns {string} The URL for the phishing warning page, or `undefined` if no URL is set.
- */
-function getPhishingWarningPageUrl({ variables, testing }) {
-  let phishingWarningPageUrl = variables.get('PHISHING_WARNING_PAGE_URL');
-
-  assert(
-    phishingWarningPageUrl === null ||
-      typeof phishingWarningPageUrl === 'string',
-  );
-  if (phishingWarningPageUrl === null) {
-    phishingWarningPageUrl = testing
-      ? 'http://localhost:9999/'
-      : `https://metamask.github.io/phishing-warning/v${phishingWarningManifest.version}/`;
-  }
-
-  // We add a hash/fragment to the URL dynamically, so we need to ensure it
-  // has a valid pathname to append a hash to.
-  const normalizedUrl = phishingWarningPageUrl.endsWith('/')
-    ? phishingWarningPageUrl
-    : `${phishingWarningPageUrl}/`;
-
-  let phishingWarningPageUrlObject;
-  try {
-    // eslint-disable-next-line no-new
-    phishingWarningPageUrlObject = new URL(normalizedUrl);
-  } catch (error) {
-    throw new Error(
-      `Invalid phishing warning page URL: '${normalizedUrl}'`,
-      error,
-    );
-  }
-  if (phishingWarningPageUrlObject.hash) {
-    // The URL fragment must be set dynamically
-    throw new Error(
-      `URL fragment not allowed in phishing warning page URL: '${normalizedUrl}'`,
-    );
-  }
-
-  return normalizedUrl;
-}
-
 const noopWriteStream = through.obj((_file, _fileEncoding, callback) =>
   callback(),
 );
@@ -247,9 +128,12 @@ module.exports = createScriptTasks;
  * @param {boolean} options.shouldLintFenceFiles - Whether files with code
  * fences should be linted after fences have been removed.
  * @param {string} options.version - The current version of the extension.
+ * @param options.shouldIncludeSnow - Whether the build should use
+ * Snow at runtime or not.
  * @returns {object} A set of tasks, one for each build target.
  */
 function createScriptTasks({
+  shouldIncludeSnow,
   applyLavaMoat,
   browserPlatforms,
   buildType,
@@ -312,6 +196,7 @@ function createScriptTasks({
     const standardSubtask = createTask(
       `${taskPrefix}:standardEntryPoints`,
       createFactoredBuild({
+        shouldIncludeSnow,
         applyLavaMoat,
         browserPlatforms,
         buildTarget,
@@ -376,6 +261,7 @@ function createScriptTasks({
       installSentrySubtask,
     ].map((subtask) =>
       runInChildProcess(subtask, {
+        shouldIncludeSnow,
         applyLavaMoat,
         buildType,
         isLavaMoat,
@@ -400,7 +286,7 @@ function createScriptTasks({
       browserPlatforms,
       buildTarget,
       buildType,
-      destFilepath: `${label}.js`,
+      destFilepath: `scripts/${label}.js`,
       entryFilepath: `./app/scripts/${label}.js`,
       ignoredFiles,
       label,
@@ -424,7 +310,7 @@ function createScriptTasks({
       browserPlatforms,
       buildTarget,
       buildType,
-      destFilepath: `${label}.js`,
+      destFilepath: `scripts/${label}.js`,
       entryFilepath: `./app/scripts/${label}.js`,
       ignoredFiles,
       label,
@@ -452,7 +338,7 @@ function createScriptTasks({
         buildTarget,
         buildType,
         browserPlatforms,
-        destFilepath: `${inpage}.js`,
+        destFilepath: `scripts/${inpage}.js`,
         entryFilepath: `./app/scripts/${inpage}.js`,
         label: inpage,
         ignoredFiles,
@@ -467,25 +353,29 @@ function createScriptTasks({
         if (process.env.ENABLE_MV3) {
           return;
         }
-        // stringify inpage.js into itself, and then make it inject itself into the page
+        // stringify scripts/inpage.js into itself, and then make it inject itself into the page
         browserPlatforms.forEach((browser) => {
           makeSelfInjecting(
-            path.join(__dirname, `../../dist/${browser}/${inpage}.js`),
+            path.join(__dirname, `../../dist/${browser}/scripts/${inpage}.js`),
           );
         });
-        // delete the inpage.js source map, as it no longer represents inpage.js
-        // and so `yarn source-map-explorer` can't handle it. It's also not
-        // useful anyway, as inpage.js is injected as a `script.textContent`,
-        // and not tracked in Sentry or browsers devtools anyway.
+        // delete the scripts/inpage.js source map, as it no longer represents
+        // scripts/inpage.js and so `yarn source-map-explorer` can't handle it.
+        // It's also not useful anyway, as scripts/inpage.js is injected as a
+        // `script.textContent`, and not tracked in Sentry or browsers devtools
+        // anyway.
         unlinkSync(
-          path.join(__dirname, `../../dist/sourcemaps/${inpage}.js.map`),
+          path.join(
+            __dirname,
+            `../../dist/sourcemaps/scripts/${inpage}.js.map`,
+          ),
         );
       },
       createNormalBundle({
         buildTarget,
         buildType,
         browserPlatforms,
-        destFilepath: `${contentscript}.js`,
+        destFilepath: `scripts/${contentscript}.js`,
         entryFilepath: `./app/scripts/${contentscript}.js`,
         label: contentscript,
         ignoredFiles,
@@ -523,9 +413,12 @@ function createScriptTasks({
  * @param {boolean} options.shouldLintFenceFiles - Whether files with code
  * fences should be linted after fences have been removed.
  * @param {string} options.version - The current version of the extension.
+ * @param options.shouldIncludeSnow - Whether the build should use
+ * Snow at runtime or not.
  * @returns {Function} A function that creates the set of bundles.
  */
 async function createManifestV3AppInitializationBundle({
+  shouldIncludeSnow,
   applyLavaMoat,
   browserPlatforms,
   buildTarget,
@@ -551,6 +444,7 @@ async function createManifestV3AppInitializationBundle({
   }
 
   const extraEnvironmentVariables = {
+    USE_SNOW: shouldIncludeSnow,
     APPLY_LAVAMOAT: applyLavaMoat,
     FILE_NAMES: jsBundles.join(','),
   };
@@ -559,7 +453,7 @@ async function createManifestV3AppInitializationBundle({
     browserPlatforms: mv3BrowserPlatforms,
     buildTarget,
     buildType,
-    destFilepath: 'app-init.js',
+    destFilepath: 'scripts/app-init.js',
     entryFilepath: './app/scripts/app-init.js',
     extraEnvironmentVariables,
     ignoredFiles,
@@ -573,9 +467,12 @@ async function createManifestV3AppInitializationBundle({
   // Code below is used to set statsMode to true when testing in MV3
   // This is used to capture module initialisation stats using lavamoat.
   if (isTestBuild(buildTarget)) {
-    const content = readFileSync('./dist/chrome/runtime-lavamoat.js', 'utf8');
+    const content = readFileSync(
+      './dist/chrome/scripts/runtime-lavamoat.js',
+      'utf8',
+    );
     const fileOutput = content.replace('statsMode = false', 'statsMode = true');
-    writeFileSync('./dist/chrome/runtime-lavamoat.js', fileOutput);
+    writeFileSync('./dist/chrome/scripts/runtime-lavamoat.js', fileOutput);
   }
 
   console.log(`Bundle end: service worker app-init.js`);
@@ -609,9 +506,12 @@ async function createManifestV3AppInitializationBundle({
  * @param {boolean} options.shouldLintFenceFiles - Whether files with code
  * fences should be linted after fences have been removed.
  * @param {string} options.version - The current version of the extension.
+ * @param options.shouldIncludeSnow - Whether the build should use
+ * Snow at runtime or not.
  * @returns {Function} A function that creates the set of bundles.
  */
 function createFactoredBuild({
+  shouldIncludeSnow,
   applyLavaMoat,
   browserPlatforms,
   buildTarget,
@@ -635,12 +535,16 @@ function createFactoredBuild({
     const environment = getEnvironment({ buildTarget });
     const config = await getConfig(buildType, environment);
     const { variables, activeBuild } = config;
-    await setEnvironmentVariables({
-      buildTarget,
+    setEnvironmentVariables({
+      isDevBuild: reloadOnChange,
+      isTestBuild: isTestBuild(buildTarget),
+      buildName: getBuildName({
+        environment,
+        buildType,
+      }),
       buildType,
       environment,
       variables,
-      activeBuild,
       version,
     });
     const features = {
@@ -670,12 +574,17 @@ function createFactoredBuild({
         __dirname,
         `../../lavamoat/browserify/${buildType}/policy.json`,
       ),
+      policyDebug: path.resolve(
+        __dirname,
+        `../../lavamoat/browserify/${buildType}/policy-debug.json`,
+      ),
       policyName: buildType,
       policyOverride: path.resolve(
         __dirname,
         `../../lavamoat/browserify/policy-override.json`,
       ),
       writeAutoPolicy: process.env.WRITE_AUTO_POLICY,
+      writeAutoPolicyDebug: process.env.WRITE_AUTO_POLICY_DEBUG,
     };
     Object.assign(bundlerOpts, lavamoatBrowserify.args);
     bundlerOpts.plugin.push([lavamoatBrowserify, lavamoatOpts]);
@@ -718,7 +627,7 @@ function createFactoredBuild({
       // add lavamoat policy loader file to packer output
       moduleGroupPackerStream.push(
         new Vinyl({
-          path: 'policy-load.js',
+          path: 'scripts/policy-load.js',
           contents: lavapack.makePolicyLoaderStream(lavamoatOpts),
         }),
       );
@@ -749,14 +658,23 @@ function createFactoredBuild({
           buildTarget === BUILD_TARGETS.TEST_DEV;
         switch (groupLabel) {
           case 'ui': {
+            renderHtmlFile({
+              htmlName: 'loading',
+              browserPlatforms,
+              shouldIncludeSnow,
+              applyLavaMoat,
+              isMMI: buildType === 'mmi',
+            });
             renderHtmlFile({
               htmlName: 'popup',
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat,
             });
             renderHtmlFile({
               htmlName: 'notification',
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat,
               isMMI: buildType === 'mmi',
               isTest,
@@ -764,6 +682,7 @@ function createFactoredBuild({
             renderHtmlFile({
               htmlName: 'home',
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat,
               isMMI: buildType === 'mmi',
               isTest,
@@ -772,6 +691,7 @@ function createFactoredBuild({
               groupSet,
               commonSet,
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat,
               destinationFileName: 'load-app.js',
             });
@@ -783,12 +703,14 @@ function createFactoredBuild({
               groupSet,
               commonSet,
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat,
             });
             renderJavaScriptLoader({
               groupSet,
               commonSet,
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat,
               destinationFileName: 'load-background.js',
             });
@@ -796,8 +718,9 @@ function createFactoredBuild({
               const jsBundles = [
                 ...commonSet.values(),
                 ...groupSet.values(),
-              ].map((label) => `./${label}.js`);
+              ].map((label) => `../${label}.js`);
               await createManifestV3AppInitializationBundle({
+                shouldIncludeSnow,
                 applyLavaMoat,
                 browserPlatforms,
                 buildTarget,
@@ -817,6 +740,7 @@ function createFactoredBuild({
               groupSet,
               commonSet,
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat: false,
             });
             break;
@@ -826,6 +750,7 @@ function createFactoredBuild({
               groupSet,
               commonSet,
               browserPlatforms,
+              shouldIncludeSnow,
               applyLavaMoat,
               destinationFileName: 'load-offscreen.js',
             });
@@ -900,12 +825,16 @@ function createNormalBundle({
     const environment = getEnvironment({ buildTarget });
     const config = await getConfig(buildType, environment);
     const { activeBuild, variables } = config;
-    await setEnvironmentVariables({
-      buildTarget,
+    setEnvironmentVariables({
+      buildName: getBuildName({
+        environment,
+        buildType,
+      }),
+      isDevBuild: devMode,
+      isTestBuild: isTestBuild(buildTarget),
       buildType,
       variables,
       environment,
-      activeBuild,
       version,
     });
     Object.entries(extraEnvironmentVariables ?? {}).forEach(([key, value]) =>
@@ -993,8 +922,14 @@ function setupBundlerDefaults(
           extensions,
         },
       ],
-      // Inline `fs.readFileSync` files
-      brfs,
+      // We are transpelling the firebase package to be compatible with the lavaMoat restrictions
+      [
+        babelify,
+        {
+          only: ['./**/node_modules/firebase', './**/node_modules/@firebase'],
+          global: true,
+        },
+      ],
     ],
     // Look for TypeScript files when walking the dependency tree
     extensions,
@@ -1198,74 +1133,11 @@ async function createBundle(buildConfiguration, { reloadOnChange }) {
   }
 }
 
-/**
- * Sets environment variables to inject in the current build.
- *
- * @param {object} options - Build options.
- * @param {BUILD_TARGETS} options.buildTarget - The current build target.
- * @param {string} options.buildType - The current build type (e.g. "main",
- * "flask", etc.).
- * @param {string} options.version - The current version of the extension.
- * @param options.activeBuild
- * @param options.variables
- * @param options.environment
- */
-async function setEnvironmentVariables({
-  buildTarget,
-  buildType,
-  activeBuild,
-  environment,
-  variables,
-  version,
-}) {
-  const devMode = isDevBuild(buildTarget);
-  const testing = isTestBuild(buildTarget);
-
-  variables.set({
-    DEBUG: devMode || testing ? variables.getMaybe('DEBUG') : undefined,
-    EIP_4337_ENTRYPOINT:
-      variables.getMaybe('EIP_4337_ENTRYPOINT') ||
-      (testing ? '0x18b06605539dc02ecD3f7AB314e38eB7c1dA5c9b' : undefined),
-    IN_TEST: testing,
-    INFURA_PROJECT_ID: getInfuraProjectId({
-      buildType,
-      activeBuild,
-      variables,
-      environment,
-      testing,
-    }),
-    METAMASK_DEBUG: devMode || variables.getMaybe('METAMASK_DEBUG') === true,
-    METAMASK_BUILD_NAME: getBuildName({
-      environment,
-      buildType,
-    }),
-    METAMASK_BUILD_APP_ID: getBuildAppId({
-      buildType,
-    }),
-    METAMASK_BUILD_ICON: getBuildIcon({
-      buildType,
-    }),
-    METAMASK_ENVIRONMENT: environment,
-    METAMASK_VERSION: version,
-    METAMASK_BUILD_TYPE: buildType,
-    NODE_ENV: devMode ? ENVIRONMENT.DEVELOPMENT : ENVIRONMENT.PRODUCTION,
-    PHISHING_WARNING_PAGE_URL: getPhishingWarningPageUrl({
-      variables,
-      testing,
-    }),
-    SEGMENT_WRITE_KEY: getSegmentWriteKey({
-      buildType,
-      activeBuild,
-      variables,
-      environment,
-    }),
-  });
-}
-
 function renderJavaScriptLoader({
   groupSet,
   commonSet,
   browserPlatforms,
+  shouldIncludeSnow,
   applyLavaMoat,
   destinationFileName,
 }) {
@@ -1280,18 +1152,23 @@ function renderJavaScriptLoader({
   );
 
   const securityScripts = applyLavaMoat
-    ? ['./runtime-lavamoat.js', './lockdown-more.js', './policy-load.js']
+    ? [
+        './scripts/runtime-lavamoat.js',
+        './scripts/lockdown-more.js',
+        './scripts/policy-load.js',
+      ]
     : [
-        './lockdown-install.js',
-        './lockdown-run.js',
-        './lockdown-more.js',
-        './runtime-cjs.js',
+        './scripts/lockdown-install.js',
+        './scripts/lockdown-run.js',
+        './scripts/lockdown-more.js',
+        './scripts/runtime-cjs.js',
       ];
 
   const requiredScripts = [
-    './snow.js',
-    './use-snow.js',
-    './sentry-install.js',
+    ...(shouldIncludeSnow
+      ? ['./scripts/snow.js', './scripts/use-snow.js']
+      : []),
+    './scripts/sentry-install.js',
     ...securityScripts,
     ...jsBundles,
   ];
@@ -1313,6 +1190,7 @@ function renderJavaScriptLoader({
 function renderHtmlFile({
   htmlName,
   browserPlatforms,
+  shouldIncludeSnow,
   applyLavaMoat,
   isMMI,
   isTest,
@@ -1322,11 +1200,21 @@ function renderHtmlFile({
       'build/scripts/renderHtmlFile - must specify "applyLavaMoat" option',
     );
   }
+  if (shouldIncludeSnow === undefined) {
+    throw new Error(
+      'build/scripts/renderHtmlFile - must specify "shouldIncludeSnow" option',
+    );
+  }
+
   const htmlFilePath = `./app/${htmlName}.html`;
   const htmlTemplate = readFileSync(htmlFilePath, 'utf8');
 
   const eta = new Eta();
-  const htmlOutput = eta.renderString(htmlTemplate, { isMMI, isTest });
+  const htmlOutput = eta.renderString(htmlTemplate, {
+    isMMI,
+    isTest,
+    shouldIncludeSnow,
+  });
   browserPlatforms.forEach((platform) => {
     const dest = `./dist/${platform}/${htmlName}.html`;
     // we dont have a way of creating async events atm
diff --git a/development/build/set-environment-variables.js b/development/build/set-environment-variables.js
new file mode 100644
index 000000000000..13e7e96f1f24
--- /dev/null
+++ b/development/build/set-environment-variables.js
@@ -0,0 +1,217 @@
+const { readFileSync } = require('node:fs');
+const assert = require('node:assert');
+const { ENVIRONMENT } = require('./constants');
+
+/**
+ * Sets environment variables to inject in the current build.
+ *
+ * @param {object} options - Build options.
+ * @param {string} options.buildName - The name of the build.
+ * @param {boolean} options.isDevBuild - Whether the build is a development build.
+ * @param {boolean} options.isTestBuild - Whether the build is a test build.
+ * @param {string} options.buildType - The current build type (e.g. "main",
+ * "flask", etc.).
+ * @param {string} options.version - The current version of the extension.
+ * @param {import('../lib/variables').Variables} options.variables
+ * @param {ENVIRONMENT[keyof ENVIRONMENT]} options.environment - The build environment.
+ */
+module.exports.setEnvironmentVariables = function setEnvironmentVariables({
+  buildName,
+  isDevBuild,
+  isTestBuild,
+  buildType,
+  environment,
+  variables,
+  version,
+}) {
+  variables.set({
+    DEBUG: isDevBuild || isTestBuild ? variables.getMaybe('DEBUG') : undefined,
+    EIP_4337_ENTRYPOINT: isTestBuild
+      ? '0x18b06605539dc02ecD3f7AB314e38eB7c1dA5c9b'
+      : variables.getMaybe('EIP_4337_ENTRYPOINT'),
+    IN_TEST: isTestBuild,
+    INFURA_PROJECT_ID: getInfuraProjectId({
+      buildType,
+      variables,
+      environment,
+      testing: isTestBuild,
+    }),
+    METAMASK_DEBUG: isDevBuild || variables.getMaybe('METAMASK_DEBUG') === true,
+    METAMASK_BUILD_NAME: buildName,
+    METAMASK_BUILD_APP_ID: getBuildAppId({
+      buildType,
+    }),
+    METAMASK_BUILD_ICON: getBuildIcon({
+      buildType,
+    }),
+    METAMASK_ENVIRONMENT: environment,
+    METAMASK_VERSION: version,
+    METAMASK_BUILD_TYPE: buildType,
+    NODE_ENV: isDevBuild ? ENVIRONMENT.DEVELOPMENT : ENVIRONMENT.PRODUCTION,
+    PHISHING_WARNING_PAGE_URL: getPhishingWarningPageUrl({
+      variables,
+      testing: isTestBuild,
+    }),
+    SEGMENT_WRITE_KEY: getSegmentWriteKey({
+      buildType,
+      variables,
+      environment,
+    }),
+    TEST_GAS_FEE_FLOWS:
+      isDevBuild && variables.getMaybe('TEST_GAS_FEE_FLOWS') === true,
+  });
+};
+
+const BUILD_TYPES_TO_SVG_LOGO_PATH = {
+  main: './app/images/logo/metamask-fox.svg',
+  beta: './app/build-types/beta/images/logo/metamask-fox.svg',
+  flask: './app/build-types/flask/images/logo/metamask-fox.svg',
+  mmi: './app/build-types/mmi/images/logo/mmi-logo.svg',
+  desktop: './app/build-types/desktop/images/logo/metamask-fox.svg',
+};
+
+/**
+ * Get the image data uri for the svg icon for the current build.
+ *
+ * @param {object} options - The build options.
+ * @param {string} options.buildType - The build type of the current build.
+ * @returns {string} The image data uri for the icon.
+ */
+function getBuildIcon({ buildType }) {
+  const svgLogoPath =
+    BUILD_TYPES_TO_SVG_LOGO_PATH[buildType] ||
+    BUILD_TYPES_TO_SVG_LOGO_PATH.main;
+  // encode as base64 as its more space-efficient for most SVGs than a data uri
+  return `data:image/svg+xml;base64,${readFileSync(svgLogoPath, 'base64')}`;
+}
+
+/**
+ * Get the app ID for the current build. Should be valid reverse FQDN.
+ *
+ * @param {object} options - The build options.
+ * @param {string} options.buildType - The build type of the current build.
+ * @returns {string} The build app ID.
+ */
+function getBuildAppId({ buildType }) {
+  const baseDomain = 'io.metamask';
+  return buildType === 'main' ? baseDomain : `${baseDomain}.${buildType}`;
+}
+
+/**
+ * Get the appropriate Infura project ID.
+ *
+ * @param {object} options - The Infura project ID options.
+ * @param {string} options.buildType - The current build type.
+ * @param {ENVIRONMENT[keyof ENVIRONMENT]} options.environment - The build environment.
+ * @param {boolean} options.testing - Whether this is a test build or not.
+ * @param options.variables
+ * @returns {string} The Infura project ID.
+ */
+function getInfuraProjectId({ buildType, variables, environment, testing }) {
+  const EMPTY_PROJECT_ID = '00000000000000000000000000000000';
+  if (testing) {
+    return EMPTY_PROJECT_ID;
+  } else if (environment !== ENVIRONMENT.PRODUCTION) {
+    // Skip validation because this is unset on PRs from forks.
+    // For forks, return empty project ID if we don't have one.
+    if (
+      !variables.isDefined('INFURA_PROJECT_ID') &&
+      environment === ENVIRONMENT.PULL_REQUEST
+    ) {
+      return EMPTY_PROJECT_ID;
+    }
+    return variables.get('INFURA_PROJECT_ID');
+  }
+  /** @type {string|undefined} */
+  const infuraKeyReference = variables.get('INFURA_ENV_KEY_REF');
+  assert(
+    typeof infuraKeyReference === 'string' && infuraKeyReference.length > 0,
+    `Build type "${buildType}" has improperly set INFURA_ENV_KEY_REF in builds.yml. Current value: "${infuraKeyReference}"`,
+  );
+  /** @type {string|undefined} */
+  const infuraProjectId = variables.get(infuraKeyReference);
+  assert(
+    typeof infuraProjectId === 'string' && infuraProjectId.length > 0,
+    `Infura Project ID environmental variable "${infuraKeyReference}" is set improperly.`,
+  );
+  return infuraProjectId;
+}
+
+/**
+ * Get the appropriate Segment write key.
+ *
+ * @param {object} options - The Segment write key options.
+ * @param {string} options.buildType - The current build type.
+ * @param {keyof ENVIRONMENT} options.environment - The current build environment.
+ * @param {import('../lib/variables').Variables} options.variables - Object containing all variables that modify the build pipeline
+ * @returns {string} The Segment write key.
+ */
+function getSegmentWriteKey({ buildType, variables, environment }) {
+  if (environment !== ENVIRONMENT.PRODUCTION) {
+    // Skip validation because this is unset on PRs from forks, and isn't necessary for development builds.
+    return variables.get('SEGMENT_WRITE_KEY');
+  }
+
+  const segmentKeyReference = variables.get('SEGMENT_WRITE_KEY_REF');
+  assert(
+    typeof segmentKeyReference === 'string' && segmentKeyReference.length > 0,
+    `Build type "${buildType}" has improperly set SEGMENT_WRITE_KEY_REF in builds.yml. Current value: "${segmentKeyReference}"`,
+  );
+
+  const segmentWriteKey = variables.get(segmentKeyReference);
+  assert(
+    typeof segmentWriteKey === 'string' && segmentWriteKey.length > 0,
+    `Segment Write Key environmental variable "${segmentKeyReference}" is set improperly.`,
+  );
+  return segmentWriteKey;
+}
+
+/**
+ * Get the URL for the phishing warning page, if it has been set.
+ *
+ * @param {object} options - The phishing warning page options.
+ * @param {boolean} options.testing - Whether this is a test build or not.
+ * @param {import('../lib/variables').Variables} options.variables - Object containing all variables that modify the build pipeline
+ * @returns {string} The URL for the phishing warning page, or `undefined` if no URL is set.
+ */
+function getPhishingWarningPageUrl({ variables, testing }) {
+  let phishingWarningPageUrl = variables.get('PHISHING_WARNING_PAGE_URL');
+
+  assert(
+    phishingWarningPageUrl === null ||
+      typeof phishingWarningPageUrl === 'string',
+  );
+  if (phishingWarningPageUrl === null) {
+    phishingWarningPageUrl = testing
+      ? 'http://localhost:9999/'
+      : `https://metamask.github.io/phishing-warning/v${
+          // eslint-disable-next-line node/global-require
+          require('@metamask/phishing-warning/package.json').version
+        }/`;
+  }
+
+  // We add a hash/fragment to the URL dynamically, so we need to ensure it
+  // has a valid pathname to append a hash to.
+  const normalizedUrl = phishingWarningPageUrl.endsWith('/')
+    ? phishingWarningPageUrl
+    : `${phishingWarningPageUrl}/`;
+
+  let phishingWarningPageUrlObject;
+  try {
+    // eslint-disable-next-line no-new
+    phishingWarningPageUrlObject = new URL(normalizedUrl);
+  } catch (error) {
+    throw new Error(
+      `Invalid phishing warning page URL: '${normalizedUrl}'`,
+      error,
+    );
+  }
+  if (phishingWarningPageUrlObject.hash) {
+    // The URL fragment must be set dynamically
+    throw new Error(
+      `URL fragment not allowed in phishing warning page URL: '${normalizedUrl}'`,
+    );
+  }
+
+  return normalizedUrl;
+}
diff --git a/development/build/static.js b/development/build/static.js
index c8eb7d6d5ef2..20e22eeddcca 100644
--- a/development/build/static.js
+++ b/development/build/static.js
@@ -147,54 +147,54 @@ function getCopyTargets(
       pattern: `*.css`,
       dest: ``,
     },
-    {
-      src: `./app/loading.html`,
-      dest: `loading.html`,
-    },
-    {
-      src: shouldIncludeSnow
-        ? `./node_modules/@lavamoat/snow/snow.prod.js`
-        : EMPTY_JS_FILE,
-      dest: `snow.js`,
-    },
-    {
-      src: shouldIncludeSnow ? `./app/scripts/use-snow.js` : EMPTY_JS_FILE,
-      dest: `use-snow.js`,
-    },
+    ...(shouldIncludeSnow
+      ? [
+          {
+            src: shouldIncludeSnow
+              ? `./node_modules/@lavamoat/snow/snow.prod.js`
+              : EMPTY_JS_FILE,
+            dest: `scripts/snow.js`,
+          },
+          {
+            src: `./app/scripts/use-snow.js`,
+            dest: `scripts/use-snow.js`,
+          },
+        ]
+      : []),
     {
       src: shouldIncludeLockdown
         ? getPathInsideNodeModules('ses', 'dist/lockdown.umd.min.js')
         : EMPTY_JS_FILE,
-      dest: `lockdown-install.js`,
+      dest: `scripts/lockdown-install.js`,
     },
     {
       src: './app/scripts/init-globals.js',
-      dest: 'init-globals.js',
+      dest: 'scripts/init-globals.js',
     },
     {
       src: './app/scripts/load-app.js',
-      dest: 'load-app.js',
+      dest: 'scripts/load-app.js',
     },
     {
       src: shouldIncludeLockdown
         ? `./app/scripts/lockdown-run.js`
         : EMPTY_JS_FILE,
-      dest: `lockdown-run.js`,
+      dest: `scripts/lockdown-run.js`,
     },
     {
       src: shouldIncludeLockdown
         ? `./app/scripts/lockdown-more.js`
         : EMPTY_JS_FILE,
-      dest: `lockdown-more.js`,
+      dest: `scripts/lockdown-more.js`,
     },
     {
       src: getPathInsideNodeModules('@lavamoat/lavapack', 'src/runtime-cjs.js'),
-      dest: `runtime-cjs.js`,
+      dest: `scripts/runtime-cjs.js`,
       pattern: '',
     },
     {
       src: getPathInsideNodeModules('@lavamoat/lavapack', 'src/runtime.js'),
-      dest: `runtime-lavamoat.js`,
+      dest: `scripts/runtime-lavamoat.js`,
       pattern: '',
     },
     {
@@ -208,7 +208,7 @@ function getCopyTargets(
     allCopyTargets.push({
       src: getPathInsideNodeModules('@blockaid/ppom_release', '/'),
       pattern: '*.wasm',
-      dest: '',
+      dest: process.env.ENABLE_MV3 ? 'scripts/' : '',
     });
   }
 
diff --git a/development/build/task.js b/development/build/task.js
index 1b28a15f6783..cbbc1ea22578 100644
--- a/development/build/task.js
+++ b/development/build/task.js
@@ -51,7 +51,14 @@ function createTask(taskName, taskFn) {
 
 function runInChildProcess(
   task,
-  { applyLavaMoat, buildType, isLavaMoat, policyOnly, shouldLintFenceFiles },
+  {
+    shouldIncludeSnow,
+    applyLavaMoat,
+    buildType,
+    isLavaMoat,
+    policyOnly,
+    shouldLintFenceFiles,
+  },
 ) {
   const taskName = typeof task === 'string' ? task : task.taskName;
   if (!taskName) {
@@ -68,6 +75,7 @@ function runInChildProcess(
         // LavaMoat if the parent process also ran in LavaMoat.
         isLavaMoat ? 'build' : 'build:dev',
         taskName,
+        `--snow=${shouldIncludeSnow ? 'true' : 'false'}`,
         `--apply-lavamoat=${applyLavaMoat ? 'true' : 'false'}`,
         `--build-type=${buildType}`,
         `--lint-fence-files=${shouldLintFenceFiles ? 'true' : 'false'}`,
diff --git a/development/build/utils.js b/development/build/utils.js
index 07349c88db28..746290fb8e2b 100644
--- a/development/build/utils.js
+++ b/development/build/utils.js
@@ -5,14 +5,6 @@ const { capitalize } = require('lodash');
 const { loadBuildTypesConfig } = require('../lib/build-type');
 const { BUILD_TARGETS, ENVIRONMENT } = require('./constants');
 
-const BUILD_TYPES_TO_SVG_LOGO_PATH = {
-  main: './app/images/logo/metamask-fox.svg',
-  beta: './app/build-types/beta/images/logo/metamask-fox.svg',
-  flask: './app/build-types/flask/images/logo/metamask-fox.svg',
-  mmi: './app/build-types/mmi/images/logo/mmi-logo.svg',
-  desktop: './app/build-types/desktop/images/logo/metamask-fox.svg',
-};
-
 /**
  * Returns whether the current build is a development build or not.
  *
@@ -261,32 +253,6 @@ function getBuildName({
   return name;
 }
 
-/**
- * Get the app ID for the current build. Should be valid reverse FQDN.
- *
- * @param {object} options - The build options.
- * @param {string} options.buildType - The build type of the current build.
- * @returns {string} The build app ID.
- */
-function getBuildAppId({ buildType }) {
-  const baseDomain = 'io.metamask';
-  return buildType === 'main' ? baseDomain : `${baseDomain}.${buildType}`;
-}
-
-/**
- * Get the image data uri for the svg icon for the current build.
- *
- * @param {object} options - The build options.
- * @param {string} options.buildType - The build type of the current build.
- * @returns {string} The image data uri for the icon.
- */
-function getBuildIcon({ buildType }) {
-  const svgLogoPath =
-    BUILD_TYPES_TO_SVG_LOGO_PATH[buildType] ||
-    BUILD_TYPES_TO_SVG_LOGO_PATH.main;
-  const svg = readFileSync(svgLogoPath, 'utf8');
-  return `data:image/svg+xml,${encodeURIComponent(svg)}`;
-}
 /**
  * Takes the given JavaScript file at `filePath` and replaces its contents with
  * a script that injects the original file contents into the document in which
@@ -306,8 +272,6 @@ function makeSelfInjecting(filePath) {
 module.exports = {
   getBrowserVersionMap,
   getBuildName,
-  getBuildAppId,
-  getBuildIcon,
   getEnvironment,
   isDevBuild,
   isTestBuild,
diff --git a/development/charts/flamegraph/chart/index.html b/development/charts/flamegraph/chart/index.html
index 7afe9f9d0dcb..ce53076ad9e4 100644
--- a/development/charts/flamegraph/chart/index.html
+++ b/development/charts/flamegraph/chart/index.html
@@ -9,7 +9,7 @@
       rel="stylesheet"
       href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
     />
-    <link rel="stylesheet" type="text/css" href="../lib/d3-flamegraph.css" />
+    <link rel="stylesheet" href="../lib/d3-flamegraph.css" />
 
     <style>
       /* Space out content a bit */
@@ -70,16 +70,13 @@ <h3 class="text-muted">d3-flame-graph</h3>
     </div>
 
     <!-- D3.js -->
-    <script src="https://d3js.org/d3.v7.js" charset="utf-8"></script>
+    <script src="https://d3js.org/d3.v7.js"></script>
 
     <!-- d3-flamegraph -->
-    <script type="text/javascript" src="../lib/d3-flamegraph.js"></script>
-    <script
-      type="text/javascript"
-      src="../lib/d3-flamegraph-tooltip.js"
-    ></script>
+    <script src="../lib/d3-flamegraph.js"></script>
+    <script src="../lib/d3-flamegraph-tooltip.js"></script>
 
-    <script type="text/javascript">
+    <script>
       var chart = flamegraph()
         .width(960)
         .cellHeight(18)
diff --git a/development/charts/table/index.html b/development/charts/table/index.html
index ec11ecfde5c3..8fa7c604f91b 100644
--- a/development/charts/table/index.html
+++ b/development/charts/table/index.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <script type="text/javascript" src="./jquery.min.js"></script>
+    <script src="./jquery.min.js"></script>
     <style>
       table {
         border: 1px solid black;
diff --git a/development/generate-rc-commits.js b/development/generate-rc-commits.js
index 3ad56698ea74..4de83ccaebce 100644
--- a/development/generate-rc-commits.js
+++ b/development/generate-rc-commits.js
@@ -1,11 +1,21 @@
 const fs = require('fs');
 const simpleGit = require('simple-git');
-/*
+
+const { Octokit } = require('@octokit/core');
+
+const octokit = new Octokit({
+  auth: 'your-access-token',
+});
+
+/**
  * This script is used to filter and group commits by teams based on unique commit messages.
- * It takes two branches as input and generates a CSV file with the commit hash, commit message, author, team, and PR link.
+ * It takes two branches as input and generates a CSV file with the commit message, author,PR link, team,release tag and commit hash
  * The teams and their members are defined in the 'authorTeams' object.
  *
  * Command to run the script: node development/generate-rc-commits.js origin/branchA origin/branchB
+ *
+ * @example <caption> Sample command to get all the commits from release v11.13.0 to v11.14.0 </caption>
+ *        node development/generate-rc-commits.js origin/Version-v11.14.0 origin/Version-v11.13.0
  * Output: the generated commits will be in a file named 'commits.csv'.
  */
 
@@ -18,32 +28,35 @@ const authorTeams = {
     'Daniel Rocha',
     'Howard Braham',
     'Kate Johnson',
+    'Xiaoming Wang',
+    'Charly Chevalier',
+    'Mike B',
   ],
-  'Extension UX': ['David Walsh', 'vthomas13', 'Nidhi Kumari', 'Victor Thomas'],
+  'Wallet UX': ['David Walsh', 'Nidhi Kumari', 'Jony Bursztyn'],
   'Extension Platform': [
     'chloeYue',
     'Chloe Gao',
-    'Pedro Figueiredo',
     'danjm',
     'Danica Shen',
     'Brad Decker',
-    'Mark Stacey',
     'hjetpoluru',
     'Harika Jetpoluru',
     'Marina Boboc',
     'Gauthier Petetin',
     'Dan Miller',
     'Dan J Miller',
-    'Gudahtt',
     'David Murdoch',
+    'Niranjana Binoy',
+    'Victor Thomas',
+    'vthomas13',
   ],
   DappAPI: ['tmashuang', 'jiexi', 'BelfordZ', 'Shane'],
   'Confirmation UX': [
+    'Pedro Figueiredo',
     'Sylva Elendu',
     'Olusegun Akintayo',
     'Jyoti Puri',
     'Ariella Vu',
-    'Sylva Elendu',
     'seaona',
   ],
   'Confirmation Systems': [
@@ -53,6 +66,7 @@ const authorTeams = {
     'cryptotavares',
     'Vinicius Stevam',
     'Derek Brans',
+    'sleepytanya',
   ],
   'Design Systems': ['georgewrmarshall', 'Garrett Bear', 'George Marshall'],
   Snaps: [
@@ -65,11 +79,18 @@ const authorTeams = {
     'Guillaume Roux',
     'Hassan Malik',
     'Maarten Zuidhoorn',
+    'Jonathan Ferreira',
   ],
   Assets: ['salimtb', 'sahar-fehri', 'Brian Bergeron'],
-  Linea: ['VGau'],
-  lavamoat: ['weizman', 'legobeat', 'kumavis'],
-  'Shared Libraries': ['Michele Esposito', 'Elliot Winkler'],
+  Linea: ['VGau', 'Victorien Gauch'],
+  lavamoat: ['weizman', 'legobeat', 'kumavis', 'LeoTM'],
+  'Shared Libraries': [
+    'Michele Esposito',
+    'Elliot Winkler',
+    'Gudahtt',
+    'Jongsun Suh',
+    'Mark Stacey',
+  ],
   MMI: [
     'António Regadas',
     'Albert Olivé',
@@ -77,10 +98,31 @@ const authorTeams = {
     'Shane T',
     'Bernardo Garces Chapero',
   ],
-  Swaps: ['Daniel', 'Davide Brocchetto'],
+  Swaps: ['Daniel', 'Davide Brocchetto', 'Nicolas Ferro'],
   Devex: ['Thomas Huang', 'Alex Donesky', 'jiexi', 'Zachary Belford'],
+  Notifications: ['Prithpal-Sooriya', 'Matteo Scurati', 'Prithpal Sooriya'],
+  Bridging: ['Bilal', 'micaelae'],
 };
 
+// Function to get PR labels
+async function getPRLabels(owner, repo, prNumber) {
+  try {
+    const response = await octokit.request(
+      'GET /repos/{owner}/{repo}/issues/{issue_number}/labels',
+      {
+        owner,
+        repo,
+        issue_number: prNumber,
+      },
+    );
+
+    return response.data.map((label) => label.name);
+  } catch (error) {
+    console.error('Error fetching PR labels:', error);
+    return {};
+  }
+}
+
 // Function to get the team for a given author
 function getTeamForAuthor(authorName) {
   for (const [team, authors] of Object.entries(authorTeams)) {
@@ -108,10 +150,10 @@ async function filterCommitsByTeam(branchA, branchB) {
 
     const log = await git.log(logOptions);
     const seenMessages = new Set();
-    const seenMessagesArray = [];
     const commitsByTeam = {};
 
     const MAX_COMMITS = 500; // Limit the number of commits to process
+    console.log('Generation of the CSV file "commits.csv" is in progress...');
 
     for (const commit of log.all) {
       const { author, message, hash } = commit;
@@ -122,14 +164,28 @@ async function filterCommitsByTeam(branchA, branchB) {
       const team = getTeamForAuthor(author);
 
       // Extract PR number from the commit message using regex
-      const prMatch = message.match(/\(#(\d{5})\)$/u);
+      const prMatch = message.match(/\(#(\d+)\)/u);
       const prLink = prMatch
         ? `https://github.com/MetaMask/metamask-extension/pull/${prMatch[1]}`
         : '';
 
-      // Check if the commit message is unique
-      if (!seenMessages.has(message)) {
-        seenMessagesArray.push(message);
+      // Check if the commit message is unique and exclude 'Changelog' or 'Merge pull request' or 'master-sync' in the message
+      if (
+        !seenMessages.has(message) &&
+        prMatch &&
+        !message.includes('changelog') &&
+        !message.includes('Merge pull request') &&
+        !message.includes('master-sync')
+      ) {
+        const labels = await getPRLabels(
+          'MetaMask',
+          'metamask-extension',
+          prMatch[1],
+        );
+        const filteredLabels = labels.filter((label) =>
+          label.includes('release'),
+        );
+        const releaseLabel = filteredLabels[0];
         seenMessages.add(message);
 
         // Initialize the team's commits array if it doesn't exist
@@ -140,8 +196,9 @@ async function filterCommitsByTeam(branchA, branchB) {
         commitsByTeam[team].push({
           message,
           author,
-          hash: hash.substring(0, 10),
           prLink,
+          releaseLabel,
+          hash: hash.substring(0, 10),
         });
       }
     }
@@ -157,17 +214,21 @@ function formatAsCSV(commitsByTeam) {
   const csvContent = [];
   for (const [team, commits] of Object.entries(commitsByTeam)) {
     commits.forEach((commit) => {
+      commit.message = commit.message.replace(/,/gu, ''); // Remove commas from the commit message
       const row = [
-        commit.hash,
         commit.message,
         commit.author,
-        team,
         commit.prLink,
+        team,
+        commit.releaseLabel,
+        commit.hash,
       ];
       csvContent.push(row.join(','));
     });
   }
-  csvContent.unshift('Commit Hash,Commit Message,Author,Team,PR Link');
+  csvContent.unshift(
+    'Commit Message,Author,PR Link,Team,Release Label, Commit Hash',
+  );
 
   return csvContent;
 }
diff --git a/development/lib/build-type.d.ts b/development/lib/build-type.d.ts
index dafc9e904764..7b23f19f27a6 100644
--- a/development/lib/build-type.d.ts
+++ b/development/lib/build-type.d.ts
@@ -1,5 +1,7 @@
 import { Infer, Struct } from 'superstruct';
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Unique<Element extends Struct<any>> = (
   struct: Struct<Infer<Element>[], Infer<Element>>,
   eq?: (a: Infer<Element>, b: Infer<Element>) => boolean,
diff --git a/development/lib/run-command.js b/development/lib/run-command.js
index e7f70a0ee130..fab1eca361d4 100644
--- a/development/lib/run-command.js
+++ b/development/lib/run-command.js
@@ -14,7 +14,7 @@ const spawn = require('cross-spawn');
  *
  * @param {string} command - The command to run
  * @param {Array<string>} [args] - The arguments to pass to the command
- * @returns {Array<string>} Lines of output received via STDOUT
+ * @returns {Promise<Array<string>>} Lines of output received via STDOUT
  */
 async function runCommand(command, args) {
   const output = [];
diff --git a/development/sourcemap-validator.js b/development/sourcemap-validator.js
index 585144100942..231e582530ae 100755
--- a/development/sourcemap-validator.js
+++ b/development/sourcemap-validator.js
@@ -10,7 +10,7 @@ const fsAsync = pify(fs);
 //
 // Utility to help check if sourcemaps are working
 //
-// searches `dist/chrome/inpage.js` for "new Error" statements
+// searches `dist/chrome/scripts/inpage.js` for "new Error" statements
 // and prints their source lines using the sourcemaps.
 // if not working it may error or print minified garbage
 //
@@ -25,8 +25,8 @@ async function start() {
     `common-0.js`,
     `background-0.js`,
     `ui-0.js`,
-    `contentscript.js`,
-    // `inpage.js`, skipped because the validator can't sample the inlined `inpage.js` script
+    `scripts/contentscript.js`,
+    // `scripts/inpage.js`, skipped because the validator can't sample the inlined `scripts/inpage.js` script
   ];
   let valid = true;
 
diff --git a/development/ts-migration-dashboard/app/public/index.html b/development/ts-migration-dashboard/app/public/index.html
index 9e72685b3f9a..2a196a45e656 100644
--- a/development/ts-migration-dashboard/app/public/index.html
+++ b/development/ts-migration-dashboard/app/public/index.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
     <title>Extension TypeScript Migration Status</title>
-    <link rel="stylesheet" type="text/css" href="index.css">
+    <link rel="stylesheet" href="index.css">
   </head>
   <body>
     <div id="app"></div>
-    <script src="index.js" type="text/javascript" charset="utf-8"></script>
+    <script src="index.js"></script>
   </body>
 </html>
diff --git a/development/ts-migration-dashboard/common/partitions-file.ts b/development/ts-migration-dashboard/common/partitions-file.ts
index e14c9a24fc12..4b754b715cfc 100644
--- a/development/ts-migration-dashboard/common/partitions-file.ts
+++ b/development/ts-migration-dashboard/common/partitions-file.ts
@@ -1,40 +1,19 @@
+import { mkdirSync, writeFileSync } from 'fs';
+import { dirname, join } from 'path';
 import { ModulePartition } from './build-module-partitions';
 import { INTERMEDIATE_BUILD_DIRECTORY_PATH } from './constants';
 
-// The `brfs` transform for browserify calls `fs.readLineSync` and
-// `path.resolve` at build time and inlines file contents into the source code.
-// To accomplish this we have to bring in `fs` and `path` using `require` and
-// not `import`. This is weird in a TypeScript file, and typescript-eslint
-// (rightly) complains about this, but it's actually okay because the above
-// `import` lines will actually get turned into `require`s anyway before passing
-// through the rest of browserify. However, `brfs` should handle this. There is
-// an active bug for this, but there isn't a known workaround yet:
-// <https://github.com/browserify/brfs/issues/39>
-/* eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires */
-const fs = require('fs');
-/* eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires */
-const path = require('path');
-
-export const PARTITIONS_FILE = path.join(
+export const PARTITIONS_FILE = join(
   INTERMEDIATE_BUILD_DIRECTORY_PATH,
   'partitions.json',
 );
 
 export function readPartitionsFile() {
-  const content = fs.readFileSync(
-    // As this function is called within the app code, which is compiled by
-    // Browserify and not executed by Node, this needs to be here — it cannot be
-    // extracted — for the reasons explained above.
-    path.resolve(__dirname, '../build/intermediate/partitions.json'),
-    { encoding: 'utf-8' },
-  );
-  return JSON.parse(content) as ModulePartition[];
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+  return require('../build/intermediate/partitions.json') as ModulePartition[];
 }
 
 export function writePartitionsFile(partitions: ModulePartition[]) {
-  fs.mkdirSync(path.dirname(PARTITIONS_FILE), { recursive: true });
-  return fs.writeFileSync(
-    PARTITIONS_FILE,
-    JSON.stringify(partitions, null, '  '),
-  );
+  mkdirSync(dirname(PARTITIONS_FILE), { recursive: true });
+  return writeFileSync(PARTITIONS_FILE, JSON.stringify(partitions, null, '  '));
 }
diff --git a/development/ts-migration-dashboard/files-to-convert.json b/development/ts-migration-dashboard/files-to-convert.json
index 9f63dc841229..e9bd7a50e38b 100644
--- a/development/ts-migration-dashboard/files-to-convert.json
+++ b/development/ts-migration-dashboard/files-to-convert.json
@@ -947,10 +947,6 @@
   "ui/components/ui/show-hide-toggle/show-hide-toggle.js",
   "ui/components/ui/show-hide-toggle/show-hide-toggle.stories.js",
   "ui/components/ui/show-hide-toggle/show-hide-toggle.test.js",
-  "ui/components/ui/site-icon/index.js",
-  "ui/components/ui/site-icon/site-icon.js",
-  "ui/components/ui/site-icon/site-icon.stories.js",
-  "ui/components/ui/site-icon/site-icon.test.js",
   "ui/components/ui/site-origin/index.js",
   "ui/components/ui/site-origin/site-origin.js",
   "ui/components/ui/site-origin/site-origin.stories.js",
@@ -1076,7 +1072,6 @@
   "ui/helpers/utils/metrics.js",
   "ui/helpers/utils/optimism/buildUnserializedTransaction.js",
   "ui/helpers/utils/optimism/buildUnserializedTransaction.test.js",
-  "ui/helpers/utils/optimism/fetchEstimatedL1Fee.js",
   "ui/helpers/utils/permission.js",
   "ui/helpers/utils/settings-search.js",
   "ui/helpers/utils/settings-search.test.js",
diff --git a/development/ts-migration-dashboard/scripts/build-app.ts b/development/ts-migration-dashboard/scripts/build-app.ts
index 8a78980c09ae..6480029ce9e2 100644
--- a/development/ts-migration-dashboard/scripts/build-app.ts
+++ b/development/ts-migration-dashboard/scripts/build-app.ts
@@ -67,8 +67,6 @@ async function compileScripts(src: string, dest: string) {
   bundler.add(src);
   // Run TypeScript files through Babel
   bundler.transform('babelify', { extensions });
-  // Inline `fs.readFileSync` files
-  bundler.transform('brfs');
 
   const bundleStream = bundler.bundle();
   bundleStream.pipe(fs.createWriteStream(dest));
diff --git a/development/verify-locale-strings.js b/development/verify-locale-strings.js
index 2a1e73cb8557..fd679815d52f 100755
--- a/development/verify-locale-strings.js
+++ b/development/verify-locale-strings.js
@@ -192,6 +192,7 @@ async function verifyEnglishLocale() {
       'app/scripts/constants/**/*.js',
       'app/scripts/constants/**/*.ts',
       'app/scripts/platforms/**/*.js',
+      'app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts',
     ],
     {
       ignore: [...globsToStrictSearch, testGlob],
diff --git a/jest.config.js b/jest.config.js
index b5c4d27fb59e..cddb5a23144c 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -10,7 +10,6 @@ module.exports = {
     '<rootDir>/app/scripts/controllers/preferences.js',
     '<rootDir>/app/scripts/flask/**/*.js',
     '<rootDir>/app/scripts/lib/**/*.(js|ts)',
-    '<rootDir>/app/scripts/lib/createRPCMethodTrackingMiddleware.js',
     '<rootDir>/app/scripts/metamask-controller.js',
     '<rootDir>/app/scripts/migrations/*.js',
     '<rootDir>/app/scripts/migrations/*.ts',
@@ -45,11 +44,16 @@ module.exports = {
     '<rootDir>/app/scripts/controllers/transactions/etherscan.test.ts',
     '<rootDir>/app/scripts/controllers/transactions/EtherscanRemoteTransactionSource.test.ts',
     '<rootDir>/app/scripts/controllers/transactions/IncomingTransactionHelper.test.ts',
+    '<rootDir>/app/scripts/controllers/onboarding.test.ts',
     '<rootDir>/app/scripts/controllers/mmi-controller.test.ts',
     '<rootDir>/app/scripts/controllers/permissions/**/*.test.js',
     '<rootDir>/app/scripts/controllers/preferences.test.js',
     '<rootDir>/app/scripts/controllers/sign.test.ts',
     '<rootDir>/app/scripts/controllers/decrypt-message.test.ts',
+    '<rootDir>/app/scripts/controllers/authentication/**/*.test.ts',
+    '<rootDir>/app/scripts/controllers/push-platform-notifications/**/*.test.ts',
+    '<rootDir>/app/scripts/controllers/user-storage/**/*.test.ts',
+    '<rootDir>/app/scripts/controllers/metamask-notifications/**/*.test.ts',
     '<rootDir>/app/scripts/flask/**/*.test.js',
     '<rootDir>/app/scripts/lib/**/*.test.(js|ts)',
     '<rootDir>/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js',
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index ea011ec9acb3..e98fffe9d8b9 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -108,30 +108,30 @@
         "browserify>util": true
       }
     },
-    "@ethereumjs/common": {
+    "@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "@ethereumjs/common>crc-32": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
         "define": true
       }
     },
-    "@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
         "TextEncoder": true
@@ -175,8 +175,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -184,14 +184,34 @@
         "TextEncoder": true
       },
       "packages": {
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethersproject/abi": {
@@ -708,34 +728,27 @@
     },
     "@metamask/address-book-controller": {
       "packages": {
-        "@metamask/address-book-controller>@metamask/controller-utils": true,
-        "@metamask/base-controller": true
+        "@metamask/address-book-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/address-book-controller>@metamask/controller-utils": {
+    "@metamask/address-book-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/announcement-controller": {
       "packages": {
-        "@metamask/base-controller": true
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
     "@metamask/announcement-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
       "packages": {
         "immer": true
       }
@@ -768,6 +781,7 @@
         "AbortController": true,
         "Headers": true,
         "URL": true,
+        "URLSearchParams": true,
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
@@ -781,14 +795,14 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/controller-utils": true,
-        "@metamask/assets-controllers>@metamask/metamask-eth-abis": true,
+        "@metamask/assets-controllers>@metamask/base-controller": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/assets-controllers>cockatiel": true,
         "@metamask/assets-controllers>multiformats": true,
-        "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
@@ -799,22 +813,12 @@
         "webpack>events": true
       }
     },
-    "@metamask/assets-controllers>@metamask/controller-utils": {
+    "@metamask/assets-controllers>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/assets-controllers>@metamask/polling-controller": {
@@ -824,11 +828,19 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
+    "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/assets-controllers>cockatiel": {
       "globals": {
         "AbortController": true,
@@ -898,7 +910,8 @@
         "console.log": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
+        "@noble/hashes": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
@@ -993,37 +1006,6 @@
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/eth-keyring-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/browser-passworder": true,
-        "@metamask/eth-keyring-controller>@metamask/obs-store": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/utils": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store": {
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": {
-      "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>process": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
@@ -1377,52 +1359,14 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/gas-fee-controller>@metamask/controller-utils": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
-        "bn.js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/jazzicon": {
       "globals": {
         "document.createElement": true,
@@ -1470,9 +1414,9 @@
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
         "@metamask/browser-passworder": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/base-controller": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
@@ -1480,6 +1424,14 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/keyring-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
         "TextEncoder": true
@@ -1628,11 +1580,11 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-query": true,
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/network-controller>@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
@@ -1651,24 +1603,6 @@
         "immer": true
       }
     },
-    "@metamask/network-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
         "setTimeout": true
@@ -1727,32 +1661,29 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/permission-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
+      }
+    },
+    "@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -1771,28 +1702,18 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
+    "@metamask/phishing-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/phishing-warning>eth-phishing-detect": {
@@ -1845,6 +1766,7 @@
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
     },
@@ -1898,8 +1820,16 @@
     },
     "@metamask/selected-network-controller": {
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/selected-network-controller>@metamask/base-controller": true
+      }
+    },
+    "@metamask/selected-network-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
       }
     },
     "@metamask/signature-controller": {
@@ -1918,78 +1848,207 @@
         "webpack>events": true
       }
     },
-    "@metamask/signature-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
+    "@metamask/signature-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/smart-transactions-controller": {
+      "globals": {
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@babel/runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/smart-transactions-controller": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
       "globals": {
-        "URLSearchParams": true,
         "clearInterval": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
         "setInterval": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
-        "fast-json-patch": true,
-        "lodash": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
       "packages": {
-        "immer": true
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "console": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
-        "@metamask/utils": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/smart-transactions-controller>bignumber.js": {
@@ -2008,6 +2067,13 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/snaps-execution-environments": {
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
@@ -2076,6 +2142,7 @@
         "File": true,
         "FileReader": true,
         "TextDecoder": true,
+        "TextEncoder": true,
         "URL": true,
         "console.error": true,
         "console.log": true,
@@ -2086,10 +2153,10 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
@@ -2104,59 +2171,6 @@
         "superstruct": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -2165,24 +2179,9 @@
     },
     "@metamask/snaps-utils>marked": {
       "globals": {
-        "Hooks": true,
-        "Lexer": true,
-        "Parser": true,
-        "Renderer": true,
-        "TextRenderer": true,
-        "Tokenizer": true,
         "console.error": true,
         "console.warn": true,
-        "defaults": true,
-        "define": true,
-        "inlineQueue": true,
-        "passThroughHooks": true,
-        "renderer": true,
-        "rules": true,
-        "state": true,
-        "textRenderer": true,
-        "tokenizer": true,
-        "tokens": true
+        "define": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -2222,12 +2221,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common": true,
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
@@ -2235,10 +2235,10 @@
         "@metamask/network-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
-        "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
+        "browserify>buffer": true,
         "eth-method-registry": true,
         "fast-json-patch": true,
         "lodash": true,
@@ -2254,24 +2254,6 @@
         "immer": true
       }
     },
-    "@metamask/transaction-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/transaction-controller>nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -2294,13 +2276,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
-        "@metamask/user-operation-controller>@metamask/controller-utils": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2317,24 +2299,6 @@
         "immer": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -2398,6 +2362,13 @@
         "define": true
       }
     },
+    "@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@noble/hashes": {
       "globals": {
         "TextEncoder": true,
@@ -2720,15 +2691,6 @@
         "define": true
       }
     },
-    "brfs>static-module>object-inspect": {
-      "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
     "browserify>assert": {
       "globals": {
         "Buffer": true
@@ -3210,7 +3172,7 @@
     },
     "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/providers": true,
@@ -3274,7 +3236,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/ppom-validator>elliptic": true,
@@ -3298,7 +3260,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3318,7 +3280,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3569,6 +3531,121 @@
         "setTimeout": true
       }
     },
+    "firebase": {
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/messaging": true
+      }
+    },
+    "firebase>@firebase/app": {
+      "globals": {
+        "FinalizationRegistry": true,
+        "console.warn": true
+      },
+      "packages": {
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>@firebase/logger": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/component": {
+      "packages": {
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/logger": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "firebase>@firebase/app>idb": {
+      "globals": {
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
+      }
+    },
+    "firebase>@firebase/installations": {
+      "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/messaging": {
+      "globals": {
+        "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
+        "URL": true,
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true,
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/installations": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/util": {
+      "globals": {
+        "atob": true,
+        "browser": true,
+        "btoa": true,
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
     "fuse.js": {
       "globals": {
         "console": true,
@@ -4389,6 +4466,15 @@
         "string.prototype.matchall>call-bind": true
       }
     },
+    "string.prototype.matchall>es-abstract>object-inspect": {
+      "globals": {
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
     "string.prototype.matchall>get-intrinsic": {
       "globals": {
         "AggregateError": true,
@@ -4426,8 +4512,8 @@
     },
     "string.prototype.matchall>side-channel": {
       "packages": {
-        "brfs>static-module>object-inspect": true,
         "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
         "string.prototype.matchall>get-intrinsic": true
       }
     },
@@ -4454,14 +4540,24 @@
       },
       "packages": {
         "browserify>util": true,
-        "readable-stream": true,
+        "web3-stream-provider>readable-stream": true,
         "web3-stream-provider>uuid": true
       }
     },
+    "web3-stream-provider>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
+      }
+    },
     "web3-stream-provider>uuid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "crypto": true
       }
     },
     "webextension-polyfill": {
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 39f552db13b3..aa859ca01985 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -108,30 +108,30 @@
         "browserify>util": true
       }
     },
-    "@ethereumjs/common": {
+    "@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "@ethereumjs/common>crc-32": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
         "define": true
       }
     },
-    "@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
         "TextEncoder": true
@@ -175,8 +175,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -184,14 +184,34 @@
         "TextEncoder": true
       },
       "packages": {
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethersproject/abi": {
@@ -708,34 +728,27 @@
     },
     "@metamask/address-book-controller": {
       "packages": {
-        "@metamask/address-book-controller>@metamask/controller-utils": true,
-        "@metamask/base-controller": true
+        "@metamask/address-book-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/address-book-controller>@metamask/controller-utils": {
+    "@metamask/address-book-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/announcement-controller": {
       "packages": {
-        "@metamask/base-controller": true
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
     "@metamask/announcement-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
       "packages": {
         "immer": true
       }
@@ -768,6 +781,7 @@
         "AbortController": true,
         "Headers": true,
         "URL": true,
+        "URLSearchParams": true,
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
@@ -781,14 +795,14 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/controller-utils": true,
-        "@metamask/assets-controllers>@metamask/metamask-eth-abis": true,
+        "@metamask/assets-controllers>@metamask/base-controller": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/assets-controllers>cockatiel": true,
         "@metamask/assets-controllers>multiformats": true,
-        "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
@@ -799,22 +813,12 @@
         "webpack>events": true
       }
     },
-    "@metamask/assets-controllers>@metamask/controller-utils": {
+    "@metamask/assets-controllers>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/assets-controllers>@metamask/polling-controller": {
@@ -824,11 +828,19 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
+    "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/assets-controllers>cockatiel": {
       "globals": {
         "AbortController": true,
@@ -898,7 +910,8 @@
         "console.log": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
+        "@noble/hashes": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
@@ -1078,37 +1091,6 @@
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/eth-keyring-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/browser-passworder": true,
-        "@metamask/eth-keyring-controller>@metamask/obs-store": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/utils": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store": {
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": {
-      "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>process": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
@@ -1462,52 +1444,14 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/gas-fee-controller>@metamask/controller-utils": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
-        "bn.js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/jazzicon": {
       "globals": {
         "document.createElement": true,
@@ -1555,9 +1499,9 @@
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
         "@metamask/browser-passworder": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/base-controller": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
@@ -1565,6 +1509,14 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/keyring-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
         "TextEncoder": true
@@ -1687,6 +1639,14 @@
         "browserify>url": true
       }
     },
+    "@metamask/message-signing-snap>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@noble/hashes": true
+      }
+    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -1713,11 +1673,11 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-query": true,
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/network-controller>@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
@@ -1736,24 +1696,6 @@
         "immer": true
       }
     },
-    "@metamask/network-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
         "setTimeout": true
@@ -1839,32 +1781,29 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/permission-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
+      }
+    },
+    "@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -1883,28 +1822,18 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
+    "@metamask/phishing-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/phishing-warning>eth-phishing-detect": {
@@ -2004,6 +1933,7 @@
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
     },
@@ -2074,8 +2004,16 @@
     },
     "@metamask/selected-network-controller": {
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/selected-network-controller>@metamask/base-controller": true
+      }
+    },
+    "@metamask/selected-network-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
       }
     },
     "@metamask/signature-controller": {
@@ -2123,13 +2061,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@babel/runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/base-controller": {
@@ -2137,35 +2119,120 @@
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "console": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
-        "@metamask/utils": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/smart-transactions-controller>bignumber.js": {
@@ -2186,12 +2253,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2205,7 +2273,7 @@
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
-        "json-rpc-middleware-stream": true
+        "eslint>fast-deep-equal": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2213,37 +2281,29 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller": {
+    "@metamask/snaps-controllers>@metamask/base-controller": {
       "globals": {
-        "console.error": true
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
+        "console.warn": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>readable-stream": true
       }
     },
     "@metamask/snaps-controllers>concat-stream": {
@@ -2313,6 +2373,13 @@
         "queueMicrotask": true
       }
     },
+    "@metamask/snaps-execution-environments": {
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
@@ -2381,6 +2448,7 @@
         "File": true,
         "FileReader": true,
         "TextDecoder": true,
+        "TextEncoder": true,
         "URL": true,
         "console.error": true,
         "console.log": true,
@@ -2391,10 +2459,10 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
@@ -2409,62 +2477,9 @@
         "superstruct": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
@@ -2478,24 +2493,9 @@
     },
     "@metamask/snaps-utils>marked": {
       "globals": {
-        "Hooks": true,
-        "Lexer": true,
-        "Parser": true,
-        "Renderer": true,
-        "TextRenderer": true,
-        "Tokenizer": true,
         "console.error": true,
         "console.warn": true,
-        "defaults": true,
-        "define": true,
-        "inlineQueue": true,
-        "passThroughHooks": true,
-        "renderer": true,
-        "rules": true,
-        "state": true,
-        "textRenderer": true,
-        "tokenizer": true,
-        "tokens": true
+        "define": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -2535,12 +2535,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common": true,
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
@@ -2548,10 +2549,10 @@
         "@metamask/network-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
-        "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
+        "browserify>buffer": true,
         "eth-method-registry": true,
         "fast-json-patch": true,
         "lodash": true,
@@ -2567,24 +2568,6 @@
         "immer": true
       }
     },
-    "@metamask/transaction-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/transaction-controller>nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -2607,13 +2590,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
-        "@metamask/user-operation-controller>@metamask/controller-utils": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2630,24 +2613,6 @@
         "immer": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -2711,6 +2676,13 @@
         "define": true
       }
     },
+    "@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@noble/hashes": {
       "globals": {
         "TextEncoder": true,
@@ -3038,15 +3010,6 @@
         "define": true
       }
     },
-    "brfs>static-module>object-inspect": {
-      "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
     "browserify>assert": {
       "globals": {
         "Buffer": true
@@ -3533,7 +3496,7 @@
     },
     "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/providers": true,
@@ -3597,7 +3560,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/ppom-validator>elliptic": true,
@@ -3621,7 +3584,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3641,7 +3604,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3892,6 +3855,121 @@
         "setTimeout": true
       }
     },
+    "firebase": {
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/messaging": true
+      }
+    },
+    "firebase>@firebase/app": {
+      "globals": {
+        "FinalizationRegistry": true,
+        "console.warn": true
+      },
+      "packages": {
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>@firebase/logger": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/component": {
+      "packages": {
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/logger": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "firebase>@firebase/app>idb": {
+      "globals": {
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
+      }
+    },
+    "firebase>@firebase/installations": {
+      "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/messaging": {
+      "globals": {
+        "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
+        "URL": true,
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true,
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/installations": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/util": {
+      "globals": {
+        "atob": true,
+        "browser": true,
+        "btoa": true,
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
     "fuse.js": {
       "globals": {
         "console": true,
@@ -4821,6 +4899,15 @@
         "string.prototype.matchall>call-bind": true
       }
     },
+    "string.prototype.matchall>es-abstract>object-inspect": {
+      "globals": {
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
     "string.prototype.matchall>get-intrinsic": {
       "globals": {
         "AggregateError": true,
@@ -4858,8 +4945,8 @@
     },
     "string.prototype.matchall>side-channel": {
       "packages": {
-        "brfs>static-module>object-inspect": true,
         "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
         "string.prototype.matchall>get-intrinsic": true
       }
     },
@@ -4896,14 +4983,24 @@
       },
       "packages": {
         "browserify>util": true,
-        "readable-stream": true,
+        "web3-stream-provider>readable-stream": true,
         "web3-stream-provider>uuid": true
       }
     },
+    "web3-stream-provider>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
+      }
+    },
     "web3-stream-provider>uuid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "crypto": true
       }
     },
     "webextension-polyfill": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 8af9fed295a8..47565ed57110 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -108,30 +108,30 @@
         "browserify>util": true
       }
     },
-    "@ethereumjs/common": {
+    "@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "@ethereumjs/common>crc-32": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
         "define": true
       }
     },
-    "@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
         "TextEncoder": true
@@ -175,8 +175,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -184,14 +184,34 @@
         "TextEncoder": true
       },
       "packages": {
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethersproject/abi": {
@@ -708,34 +728,27 @@
     },
     "@metamask/address-book-controller": {
       "packages": {
-        "@metamask/address-book-controller>@metamask/controller-utils": true,
-        "@metamask/base-controller": true
+        "@metamask/address-book-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/address-book-controller>@metamask/controller-utils": {
+    "@metamask/address-book-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/announcement-controller": {
       "packages": {
-        "@metamask/base-controller": true
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
     "@metamask/announcement-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
       "packages": {
         "immer": true
       }
@@ -768,6 +781,7 @@
         "AbortController": true,
         "Headers": true,
         "URL": true,
+        "URLSearchParams": true,
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
@@ -781,14 +795,14 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/controller-utils": true,
-        "@metamask/assets-controllers>@metamask/metamask-eth-abis": true,
+        "@metamask/assets-controllers>@metamask/base-controller": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/assets-controllers>cockatiel": true,
         "@metamask/assets-controllers>multiformats": true,
-        "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
@@ -799,22 +813,12 @@
         "webpack>events": true
       }
     },
-    "@metamask/assets-controllers>@metamask/controller-utils": {
+    "@metamask/assets-controllers>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/assets-controllers>@metamask/polling-controller": {
@@ -824,11 +828,19 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
+    "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/assets-controllers>cockatiel": {
       "globals": {
         "AbortController": true,
@@ -898,7 +910,8 @@
         "console.log": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
+        "@noble/hashes": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
@@ -1078,37 +1091,6 @@
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/eth-keyring-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/browser-passworder": true,
-        "@metamask/eth-keyring-controller>@metamask/obs-store": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/utils": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store": {
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": {
-      "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>process": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
@@ -1462,52 +1444,14 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/gas-fee-controller>@metamask/controller-utils": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
-        "bn.js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/jazzicon": {
       "globals": {
         "document.createElement": true,
@@ -1555,9 +1499,9 @@
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
         "@metamask/browser-passworder": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/base-controller": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
@@ -1565,6 +1509,14 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/keyring-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
         "TextEncoder": true
@@ -1687,6 +1639,14 @@
         "browserify>url": true
       }
     },
+    "@metamask/message-signing-snap>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@noble/hashes": true
+      }
+    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -1713,11 +1673,11 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-query": true,
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/network-controller>@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
@@ -1736,24 +1696,6 @@
         "immer": true
       }
     },
-    "@metamask/network-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
         "setTimeout": true
@@ -1839,32 +1781,29 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/permission-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
+      }
+    },
+    "@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -1883,28 +1822,18 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
+    "@metamask/phishing-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/phishing-warning>eth-phishing-detect": {
@@ -2056,6 +1985,7 @@
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
     },
@@ -2126,8 +2056,16 @@
     },
     "@metamask/selected-network-controller": {
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/selected-network-controller>@metamask/base-controller": true
+      }
+    },
+    "@metamask/selected-network-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
       }
     },
     "@metamask/signature-controller": {
@@ -2175,13 +2113,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@babel/runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/base-controller": {
@@ -2189,35 +2171,120 @@
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "console": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
-        "@metamask/utils": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/smart-transactions-controller>bignumber.js": {
@@ -2238,12 +2305,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2257,7 +2325,7 @@
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
-        "json-rpc-middleware-stream": true
+        "eslint>fast-deep-equal": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2265,37 +2333,29 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller": {
+    "@metamask/snaps-controllers>@metamask/base-controller": {
       "globals": {
-        "console.error": true
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
+        "console.warn": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>readable-stream": true
       }
     },
     "@metamask/snaps-controllers>concat-stream": {
@@ -2365,6 +2425,13 @@
         "queueMicrotask": true
       }
     },
+    "@metamask/snaps-execution-environments": {
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
@@ -2433,6 +2500,7 @@
         "File": true,
         "FileReader": true,
         "TextDecoder": true,
+        "TextEncoder": true,
         "URL": true,
         "console.error": true,
         "console.log": true,
@@ -2443,10 +2511,10 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
@@ -2461,62 +2529,9 @@
         "superstruct": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
@@ -2530,24 +2545,9 @@
     },
     "@metamask/snaps-utils>marked": {
       "globals": {
-        "Hooks": true,
-        "Lexer": true,
-        "Parser": true,
-        "Renderer": true,
-        "TextRenderer": true,
-        "Tokenizer": true,
         "console.error": true,
         "console.warn": true,
-        "defaults": true,
-        "define": true,
-        "inlineQueue": true,
-        "passThroughHooks": true,
-        "renderer": true,
-        "rules": true,
-        "state": true,
-        "textRenderer": true,
-        "tokenizer": true,
-        "tokens": true
+        "define": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -2587,12 +2587,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common": true,
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
@@ -2600,10 +2601,10 @@
         "@metamask/network-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
-        "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
+        "browserify>buffer": true,
         "eth-method-registry": true,
         "fast-json-patch": true,
         "lodash": true,
@@ -2619,24 +2620,6 @@
         "immer": true
       }
     },
-    "@metamask/transaction-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/transaction-controller>nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -2659,13 +2642,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
-        "@metamask/user-operation-controller>@metamask/controller-utils": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2682,24 +2665,6 @@
         "immer": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -2763,6 +2728,13 @@
         "define": true
       }
     },
+    "@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@noble/hashes": {
       "globals": {
         "TextEncoder": true,
@@ -3090,15 +3062,6 @@
         "define": true
       }
     },
-    "brfs>static-module>object-inspect": {
-      "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
     "browserify>assert": {
       "globals": {
         "Buffer": true
@@ -3585,7 +3548,7 @@
     },
     "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/providers": true,
@@ -3649,7 +3612,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/ppom-validator>elliptic": true,
@@ -3673,7 +3636,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3693,7 +3656,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3944,6 +3907,121 @@
         "setTimeout": true
       }
     },
+    "firebase": {
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/messaging": true
+      }
+    },
+    "firebase>@firebase/app": {
+      "globals": {
+        "FinalizationRegistry": true,
+        "console.warn": true
+      },
+      "packages": {
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>@firebase/logger": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/component": {
+      "packages": {
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/logger": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "firebase>@firebase/app>idb": {
+      "globals": {
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
+      }
+    },
+    "firebase>@firebase/installations": {
+      "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/messaging": {
+      "globals": {
+        "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
+        "URL": true,
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true,
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/installations": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/util": {
+      "globals": {
+        "atob": true,
+        "browser": true,
+        "btoa": true,
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
     "fuse.js": {
       "globals": {
         "console": true,
@@ -4873,6 +4951,15 @@
         "string.prototype.matchall>call-bind": true
       }
     },
+    "string.prototype.matchall>es-abstract>object-inspect": {
+      "globals": {
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
     "string.prototype.matchall>get-intrinsic": {
       "globals": {
         "AggregateError": true,
@@ -4910,8 +4997,8 @@
     },
     "string.prototype.matchall>side-channel": {
       "packages": {
-        "brfs>static-module>object-inspect": true,
         "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
         "string.prototype.matchall>get-intrinsic": true
       }
     },
@@ -4948,14 +5035,24 @@
       },
       "packages": {
         "browserify>util": true,
-        "readable-stream": true,
+        "web3-stream-provider>readable-stream": true,
         "web3-stream-provider>uuid": true
       }
     },
+    "web3-stream-provider>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
+      }
+    },
     "web3-stream-provider>uuid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "crypto": true
       }
     },
     "webextension-polyfill": {
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 83a5bc37d2d5..ad1da735db8e 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -108,30 +108,30 @@
         "browserify>util": true
       }
     },
-    "@ethereumjs/common": {
+    "@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "@ethereumjs/common>crc-32": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
         "define": true
       }
     },
-    "@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
         "TextEncoder": true
@@ -175,8 +175,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -184,14 +184,34 @@
         "TextEncoder": true
       },
       "packages": {
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethersproject/abi": {
@@ -708,34 +728,27 @@
     },
     "@metamask/address-book-controller": {
       "packages": {
-        "@metamask/address-book-controller>@metamask/controller-utils": true,
-        "@metamask/base-controller": true
+        "@metamask/address-book-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/address-book-controller>@metamask/controller-utils": {
+    "@metamask/address-book-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/announcement-controller": {
       "packages": {
-        "@metamask/base-controller": true
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
     "@metamask/announcement-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
       "packages": {
         "immer": true
       }
@@ -768,6 +781,7 @@
         "AbortController": true,
         "Headers": true,
         "URL": true,
+        "URLSearchParams": true,
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
@@ -781,14 +795,14 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/controller-utils": true,
-        "@metamask/assets-controllers>@metamask/metamask-eth-abis": true,
+        "@metamask/assets-controllers>@metamask/base-controller": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/assets-controllers>cockatiel": true,
         "@metamask/assets-controllers>multiformats": true,
-        "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
@@ -799,22 +813,12 @@
         "webpack>events": true
       }
     },
-    "@metamask/assets-controllers>@metamask/controller-utils": {
+    "@metamask/assets-controllers>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/assets-controllers>@metamask/polling-controller": {
@@ -824,11 +828,19 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
+    "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/assets-controllers>cockatiel": {
       "globals": {
         "AbortController": true,
@@ -898,7 +910,8 @@
         "console.log": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
+        "@noble/hashes": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
@@ -993,37 +1006,6 @@
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/eth-keyring-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/browser-passworder": true,
-        "@metamask/eth-keyring-controller>@metamask/obs-store": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/utils": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store": {
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": {
-      "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>process": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
@@ -1377,52 +1359,14 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/gas-fee-controller>@metamask/controller-utils": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
-        "bn.js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/jazzicon": {
       "globals": {
         "document.createElement": true,
@@ -1470,9 +1414,9 @@
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
         "@metamask/browser-passworder": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/base-controller": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
@@ -1480,6 +1424,14 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/keyring-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
         "TextEncoder": true
@@ -1602,6 +1554,14 @@
         "browserify>url": true
       }
     },
+    "@metamask/message-signing-snap>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@noble/hashes": true
+      }
+    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -1628,11 +1588,11 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-query": true,
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/network-controller>@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
@@ -1651,24 +1611,6 @@
         "immer": true
       }
     },
-    "@metamask/network-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
         "setTimeout": true
@@ -1754,32 +1696,29 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/permission-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
+      }
+    },
+    "@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -1798,28 +1737,18 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
+    "@metamask/phishing-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/phishing-warning>eth-phishing-detect": {
@@ -1971,6 +1900,7 @@
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
     },
@@ -2041,8 +1971,16 @@
     },
     "@metamask/selected-network-controller": {
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/selected-network-controller>@metamask/base-controller": true
+      }
+    },
+    "@metamask/selected-network-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
       }
     },
     "@metamask/signature-controller": {
@@ -2090,13 +2028,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@babel/runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/base-controller": {
@@ -2104,35 +2086,120 @@
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "console": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
-        "@metamask/utils": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/smart-transactions-controller>bignumber.js": {
@@ -2153,12 +2220,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2172,7 +2240,7 @@
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
-        "json-rpc-middleware-stream": true
+        "eslint>fast-deep-equal": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2180,37 +2248,29 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller": {
+    "@metamask/snaps-controllers>@metamask/base-controller": {
       "globals": {
-        "console.error": true
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
+        "console.warn": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>readable-stream": true
       }
     },
     "@metamask/snaps-controllers>concat-stream": {
@@ -2280,6 +2340,13 @@
         "queueMicrotask": true
       }
     },
+    "@metamask/snaps-execution-environments": {
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
@@ -2348,6 +2415,7 @@
         "File": true,
         "FileReader": true,
         "TextDecoder": true,
+        "TextEncoder": true,
         "URL": true,
         "console.error": true,
         "console.log": true,
@@ -2358,10 +2426,10 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
@@ -2376,62 +2444,9 @@
         "superstruct": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
@@ -2445,24 +2460,9 @@
     },
     "@metamask/snaps-utils>marked": {
       "globals": {
-        "Hooks": true,
-        "Lexer": true,
-        "Parser": true,
-        "Renderer": true,
-        "TextRenderer": true,
-        "Tokenizer": true,
         "console.error": true,
         "console.warn": true,
-        "defaults": true,
-        "define": true,
-        "inlineQueue": true,
-        "passThroughHooks": true,
-        "renderer": true,
-        "rules": true,
-        "state": true,
-        "textRenderer": true,
-        "tokenizer": true,
-        "tokens": true
+        "define": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -2502,12 +2502,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common": true,
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
@@ -2515,10 +2516,10 @@
         "@metamask/network-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
-        "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
+        "browserify>buffer": true,
         "eth-method-registry": true,
         "fast-json-patch": true,
         "lodash": true,
@@ -2534,24 +2535,6 @@
         "immer": true
       }
     },
-    "@metamask/transaction-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/transaction-controller>nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -2574,13 +2557,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
-        "@metamask/user-operation-controller>@metamask/controller-utils": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2597,24 +2580,6 @@
         "immer": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -2678,6 +2643,13 @@
         "define": true
       }
     },
+    "@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@noble/hashes": {
       "globals": {
         "TextEncoder": true,
@@ -3005,15 +2977,6 @@
         "define": true
       }
     },
-    "brfs>static-module>object-inspect": {
-      "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
     "browserify>assert": {
       "globals": {
         "Buffer": true
@@ -3500,7 +3463,7 @@
     },
     "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/providers": true,
@@ -3564,7 +3527,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/ppom-validator>elliptic": true,
@@ -3588,7 +3551,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3608,7 +3571,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3859,6 +3822,121 @@
         "setTimeout": true
       }
     },
+    "firebase": {
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/messaging": true
+      }
+    },
+    "firebase>@firebase/app": {
+      "globals": {
+        "FinalizationRegistry": true,
+        "console.warn": true
+      },
+      "packages": {
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>@firebase/logger": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/component": {
+      "packages": {
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/logger": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "firebase>@firebase/app>idb": {
+      "globals": {
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
+      }
+    },
+    "firebase>@firebase/installations": {
+      "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/messaging": {
+      "globals": {
+        "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
+        "URL": true,
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true,
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/installations": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/util": {
+      "globals": {
+        "atob": true,
+        "browser": true,
+        "btoa": true,
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
     "fuse.js": {
       "globals": {
         "console": true,
@@ -4788,6 +4866,15 @@
         "string.prototype.matchall>call-bind": true
       }
     },
+    "string.prototype.matchall>es-abstract>object-inspect": {
+      "globals": {
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
     "string.prototype.matchall>get-intrinsic": {
       "globals": {
         "AggregateError": true,
@@ -4825,8 +4912,8 @@
     },
     "string.prototype.matchall>side-channel": {
       "packages": {
-        "brfs>static-module>object-inspect": true,
         "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
         "string.prototype.matchall>get-intrinsic": true
       }
     },
@@ -4863,14 +4950,24 @@
       },
       "packages": {
         "browserify>util": true,
-        "readable-stream": true,
+        "web3-stream-provider>readable-stream": true,
         "web3-stream-provider>uuid": true
       }
     },
+    "web3-stream-provider>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
+      }
+    },
     "web3-stream-provider>uuid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "crypto": true
       }
     },
     "webextension-polyfill": {
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 9f77db1857d0..1606732f664f 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -108,30 +108,30 @@
         "browserify>util": true
       }
     },
-    "@ethereumjs/common": {
+    "@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "@ethereumjs/common>crc-32": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
         "define": true
       }
     },
-    "@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
         "TextEncoder": true
@@ -175,8 +175,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -184,14 +184,34 @@
         "TextEncoder": true
       },
       "packages": {
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethersproject/abi": {
@@ -736,12 +756,6 @@
         "@metamask/obs-store": true
       }
     },
-    "@metamask-institutional/portfolio-dashboard": {
-      "globals": {
-        "console.log": true,
-        "fetch": true
-      }
-    },
     "@metamask-institutional/rpc-allowlist": {
       "globals": {
         "URL": true
@@ -751,57 +765,17 @@
       "globals": {
         "URLSearchParams": true,
         "console.debug": true,
+        "console.error": true,
         "console.log": true,
         "console.warn": true,
         "fetch": true
       },
       "packages": {
         "@metamask-institutional/sdk>@metamask-institutional/simplecache": true,
-        "@metamask-institutional/sdk>jsonwebtoken": true,
         "browserify>crypto-browserify": true,
         "webpack>events": true
       }
     },
-    "@metamask-institutional/sdk>jsonwebtoken": {
-      "packages": {
-        "@metamask-institutional/sdk>jsonwebtoken>jws": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "browserify>process": true,
-        "lodash": true,
-        "mocha>ms": true,
-        "semver": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws": {
-      "packages": {
-        "@metamask-institutional/sdk>jsonwebtoken>jws>jwa": true,
-        "browserify>buffer": true,
-        "browserify>process": true,
-        "browserify>util": true,
-        "koa>content-disposition>safe-buffer": true,
-        "stream-browserify": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws>jwa": {
-      "packages": {
-        "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>buffer-equal-constant-time": true,
-        "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>ecdsa-sig-formatter": true,
-        "browserify>crypto-browserify": true,
-        "browserify>util": true,
-        "koa>content-disposition>safe-buffer": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>buffer-equal-constant-time": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>ecdsa-sig-formatter": {
-      "packages": {
-        "koa>content-disposition>safe-buffer": true
-      }
-    },
     "@metamask-institutional/transaction-update": {
       "globals": {
         "clearInterval": true,
@@ -810,10 +784,10 @@
         "setInterval": true
       },
       "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask-institutional/sdk": true,
         "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": true,
         "@metamask/obs-store": true,
-        "ethereumjs-util": true,
         "webpack>events": true
       }
     },
@@ -847,34 +821,27 @@
     },
     "@metamask/address-book-controller": {
       "packages": {
-        "@metamask/address-book-controller>@metamask/controller-utils": true,
-        "@metamask/base-controller": true
+        "@metamask/address-book-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/address-book-controller>@metamask/controller-utils": {
+    "@metamask/address-book-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/announcement-controller": {
       "packages": {
-        "@metamask/base-controller": true
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
     "@metamask/announcement-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
       "packages": {
         "immer": true
       }
@@ -907,6 +874,7 @@
         "AbortController": true,
         "Headers": true,
         "URL": true,
+        "URLSearchParams": true,
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
@@ -920,14 +888,14 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/controller-utils": true,
-        "@metamask/assets-controllers>@metamask/metamask-eth-abis": true,
+        "@metamask/assets-controllers>@metamask/base-controller": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/assets-controllers>cockatiel": true,
         "@metamask/assets-controllers>multiformats": true,
-        "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
@@ -938,22 +906,12 @@
         "webpack>events": true
       }
     },
-    "@metamask/assets-controllers>@metamask/controller-utils": {
+    "@metamask/assets-controllers>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/assets-controllers>@metamask/polling-controller": {
@@ -963,11 +921,19 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
+    "@metamask/assets-controllers>@metamask/polling-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/assets-controllers>cockatiel": {
       "globals": {
         "AbortController": true,
@@ -1037,7 +1003,8 @@
         "console.log": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
+        "@noble/hashes": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
@@ -1132,37 +1099,6 @@
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/eth-keyring-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/browser-passworder": true,
-        "@metamask/eth-keyring-controller>@metamask/obs-store": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/utils": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store": {
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/obs-store>readable-stream": {
-      "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>process": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
@@ -1516,52 +1452,14 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/gas-fee-controller>@metamask/controller-utils": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
-        "bn.js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/gas-fee-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "uuid": true
       }
     },
-    "@metamask/gas-fee-controller>@metamask/polling-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/jazzicon": {
       "globals": {
         "document.createElement": true,
@@ -1609,9 +1507,9 @@
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
         "@metamask/browser-passworder": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/base-controller": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
@@ -1619,6 +1517,14 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/keyring-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
         "TextEncoder": true
@@ -1741,6 +1647,14 @@
         "browserify>url": true
       }
     },
+    "@metamask/message-signing-snap>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@noble/hashes": true
+      }
+    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -1767,11 +1681,11 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-query": true,
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/network-controller>@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
@@ -1790,24 +1704,6 @@
         "immer": true
       }
     },
-    "@metamask/network-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
         "setTimeout": true
@@ -1893,32 +1789,29 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/permission-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
+      }
+    },
+    "@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -1937,28 +1830,18 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/controller-utils": true,
+        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
+    "@metamask/phishing-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "immer": true
       }
     },
     "@metamask/phishing-warning>eth-phishing-detect": {
@@ -2110,6 +1993,7 @@
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
     },
@@ -2180,8 +2064,16 @@
     },
     "@metamask/selected-network-controller": {
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/selected-network-controller>@metamask/base-controller": true
+      }
+    },
+    "@metamask/selected-network-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
       }
     },
     "@metamask/signature-controller": {
@@ -2229,13 +2121,57 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers": true,
-        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
+        "browserify>buffer": true,
         "fast-json-patch": true,
-        "lodash": true
+        "lodash": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@babel/runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true,
+        "fetch": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/util>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/base-controller": {
@@ -2243,35 +2179,120 @@
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "immer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/network-controller": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
+        "@metamask/transaction-controller>nonce-tracker": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
+      "packages": {
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/smart-transactions-controller>@babel/runtime": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "console": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": true,
-        "@metamask/utils": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controller-utils>ethjs-unit": {
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "bn.js": true
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/smart-transactions-controller>bignumber.js": {
@@ -2292,12 +2313,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2311,7 +2333,7 @@
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
-        "json-rpc-middleware-stream": true
+        "eslint>fast-deep-equal": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2319,37 +2341,29 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller": {
+    "@metamask/snaps-controllers>@metamask/base-controller": {
       "globals": {
-        "console.error": true
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/permission-controller>@metamask/controller-utils": {
+    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
+        "console.warn": true,
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>readable-stream": true
       }
     },
     "@metamask/snaps-controllers>concat-stream": {
@@ -2419,6 +2433,13 @@
         "queueMicrotask": true
       }
     },
+    "@metamask/snaps-execution-environments": {
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
@@ -2487,6 +2508,7 @@
         "File": true,
         "FileReader": true,
         "TextDecoder": true,
+        "TextEncoder": true,
         "URL": true,
         "console.error": true,
         "console.log": true,
@@ -2497,10 +2519,10 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
@@ -2515,62 +2537,9 @@
         "superstruct": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller": {
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/utils": true,
-        "deep-freeze-strict": true,
-        "immer": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
@@ -2584,24 +2553,9 @@
     },
     "@metamask/snaps-utils>marked": {
       "globals": {
-        "Hooks": true,
-        "Lexer": true,
-        "Parser": true,
-        "Renderer": true,
-        "TextRenderer": true,
-        "Tokenizer": true,
         "console.error": true,
         "console.warn": true,
-        "defaults": true,
-        "define": true,
-        "inlineQueue": true,
-        "passThroughHooks": true,
-        "renderer": true,
-        "rules": true,
-        "state": true,
-        "textRenderer": true,
-        "tokenizer": true,
-        "tokens": true
+        "define": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -2641,12 +2595,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common": true,
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
@@ -2654,10 +2609,10 @@
         "@metamask/network-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
-        "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
+        "browserify>buffer": true,
         "eth-method-registry": true,
         "fast-json-patch": true,
         "lodash": true,
@@ -2673,24 +2628,6 @@
         "immer": true
       }
     },
-    "@metamask/transaction-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/transaction-controller>nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -2713,13 +2650,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/assets-controllers>@metamask/polling-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
-        "@metamask/user-operation-controller>@metamask/controller-utils": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -2736,24 +2673,6 @@
         "immer": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -2817,6 +2736,13 @@
         "define": true
       }
     },
+    "@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@noble/hashes": {
       "globals": {
         "TextEncoder": true,
@@ -3144,15 +3070,6 @@
         "define": true
       }
     },
-    "brfs>static-module>object-inspect": {
-      "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
     "browserify>assert": {
       "globals": {
         "Buffer": true
@@ -3639,7 +3556,7 @@
     },
     "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/providers": true,
@@ -3703,7 +3620,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/ppom-validator>elliptic": true,
@@ -3727,7 +3644,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3747,7 +3664,7 @@
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "browserify>buffer": true,
         "webpack>events": true
@@ -3998,6 +3915,121 @@
         "setTimeout": true
       }
     },
+    "firebase": {
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/messaging": true
+      }
+    },
+    "firebase>@firebase/app": {
+      "globals": {
+        "FinalizationRegistry": true,
+        "console.warn": true
+      },
+      "packages": {
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>@firebase/logger": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/component": {
+      "packages": {
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/app>@firebase/logger": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "firebase>@firebase/app>idb": {
+      "globals": {
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
+      }
+    },
+    "firebase>@firebase/installations": {
+      "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/messaging": {
+      "globals": {
+        "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
+        "URL": true,
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true,
+        "firebase>@firebase/app": true,
+        "firebase>@firebase/app>@firebase/component": true,
+        "firebase>@firebase/app>idb": true,
+        "firebase>@firebase/installations": true,
+        "firebase>@firebase/util": true
+      }
+    },
+    "firebase>@firebase/util": {
+      "globals": {
+        "atob": true,
+        "browser": true,
+        "btoa": true,
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>process": true
+      }
+    },
     "fuse.js": {
       "globals": {
         "console": true,
@@ -4903,6 +4935,15 @@
         "string.prototype.matchall>call-bind": true
       }
     },
+    "string.prototype.matchall>es-abstract>object-inspect": {
+      "globals": {
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
     "string.prototype.matchall>get-intrinsic": {
       "globals": {
         "AggregateError": true,
@@ -4940,8 +4981,8 @@
     },
     "string.prototype.matchall>side-channel": {
       "packages": {
-        "brfs>static-module>object-inspect": true,
         "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
         "string.prototype.matchall>get-intrinsic": true
       }
     },
@@ -4978,14 +5019,24 @@
       },
       "packages": {
         "browserify>util": true,
-        "readable-stream": true,
+        "web3-stream-provider>readable-stream": true,
         "web3-stream-provider>uuid": true
       }
     },
+    "web3-stream-provider>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
+      }
+    },
     "web3-stream-provider>uuid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "crypto": true
       }
     },
     "webextension-polyfill": {
diff --git a/lavamoat/browserify/policy-override.json b/lavamoat/browserify/policy-override.json
index 72ded77f19ac..3ece77c837c6 100644
--- a/lavamoat/browserify/policy-override.json
+++ b/lavamoat/browserify/policy-override.json
@@ -1,5 +1,12 @@
 {
   "resources": {
+    "@metamask/snaps-execution-environments": {
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
       "globals": {
         "fetch": true
@@ -150,6 +157,9 @@
       }
     },
     "@metamask/announcement-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
       "packages": {
         "immer": true
       }
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 4148bf205991..fe2d809dc95e 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -978,7 +978,7 @@
         "@babel/core>@babel/helper-compilation-targets": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider>lodash.debounce": true,
-        "brfs>resolve": true
+        "depcheck>resolve": true
       }
     },
     "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider>lodash.debounce": {
@@ -1178,11 +1178,11 @@
         "@lavamoat/lavapack>combine-source-map": true,
         "@lavamoat/lavapack>convert-source-map": true,
         "@lavamoat/lavapack>json-stable-stringify": true,
-        "@lavamoat/lavapack>lavamoat-core": true,
         "@lavamoat/lavapack>readable-stream": true,
         "@lavamoat/lavapack>umd": true,
         "browserify>JSONStream": true,
         "eslint>espree": true,
+        "lavamoat-viz>lavamoat-core": true,
         "through2": true
       }
     },
@@ -1225,44 +1225,6 @@
         "string.prototype.matchall>call-bind": true
       }
     },
-    "@lavamoat/lavapack>lavamoat-core": {
-      "builtin": {
-        "events": true,
-        "fs.readFileSync": true,
-        "node:fs/promises.readFile": true,
-        "node:fs/promises.writeFile": true,
-        "path.extname": true,
-        "path.join": true
-      },
-      "globals": {
-        "__dirname": true,
-        "ast": true,
-        "console.error": true,
-        "console.warn": true,
-        "content": true,
-        "define": true,
-        "file": true,
-        "importMap": true,
-        "moduleInitializer": true,
-        "packageName": true,
-        "specifier": true,
-        "type": true
-      },
-      "packages": {
-        "@lavamoat/lavapack>json-stable-stringify": true,
-        "@lavamoat/lavapack>lavamoat-core>lavamoat-tofu": true,
-        "lavamoat>lavamoat-core>merge-deep": true
-      }
-    },
-    "@lavamoat/lavapack>lavamoat-core>lavamoat-tofu": {
-      "globals": {
-        "console.log": true
-      },
-      "packages": {
-        "@babel/core>@babel/parser": true,
-        "depcheck>@babel/traverse": true
-      }
-    },
     "@lavamoat/lavapack>readable-stream": {
       "builtin": {
         "buffer.Buffer": true,
@@ -1508,235 +1470,6 @@
         "readable-stream>util-deprecate": true
       }
     },
-    "brfs": {
-      "builtin": {
-        "fs.createReadStream": true,
-        "fs.readdir": true,
-        "path": true
-      },
-      "packages": {
-        "brfs>quote-stream": true,
-        "brfs>resolve": true,
-        "brfs>static-module": true,
-        "brfs>through2": true
-      }
-    },
-    "brfs>quote-stream": {
-      "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "brfs>quote-stream>buffer-equal": true,
-        "brfs>quote-stream>through2": true
-      }
-    },
-    "brfs>quote-stream>buffer-equal": {
-      "builtin": {
-        "buffer.Buffer.isBuffer": true
-      }
-    },
-    "brfs>quote-stream>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "readable-stream": true,
-        "watchify>xtend": true
-      }
-    },
-    "brfs>resolve": {
-      "builtin": {
-        "fs.readFile": true,
-        "fs.readFileSync": true,
-        "fs.realpath": true,
-        "fs.realpathSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "os.homedir": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.parse": true,
-        "path.relative": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "process.env.HOME": true,
-        "process.env.HOMEDRIVE": true,
-        "process.env.HOMEPATH": true,
-        "process.env.LNAME": true,
-        "process.env.LOGNAME": true,
-        "process.env.USER": true,
-        "process.env.USERNAME": true,
-        "process.env.USERPROFILE": true,
-        "process.getuid": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "process.versions.pnp": true
-      },
-      "packages": {
-        "brfs>resolve>path-parse": true,
-        "depcheck>is-core-module": true
-      }
-    },
-    "brfs>resolve>path-parse": {
-      "globals": {
-        "process.platform": true
-      }
-    },
-    "brfs>static-module": {
-      "packages": {
-        "brfs>static-module>acorn-node": true,
-        "brfs>static-module>escodegen": true,
-        "brfs>static-module>magic-string": true,
-        "brfs>static-module>merge-source-map": true,
-        "brfs>static-module>object-inspect": true,
-        "brfs>static-module>scope-analyzer": true,
-        "brfs>static-module>shallow-copy": true,
-        "brfs>static-module>static-eval": true,
-        "brfs>static-module>through2": true,
-        "browserify>concat-stream": true,
-        "browserify>duplexer2": true,
-        "browserify>has": true,
-        "nyc>convert-source-map": true,
-        "readable-stream": true
-      }
-    },
-    "brfs>static-module>acorn-node": {
-      "packages": {
-        "@storybook/react>acorn-walk": true,
-        "brfs>static-module>acorn-node>acorn": true,
-        "watchify>xtend": true
-      }
-    },
-    "brfs>static-module>acorn-node>acorn": {
-      "globals": {
-        "define": true
-      }
-    },
-    "brfs>static-module>escodegen": {
-      "globals": {
-        "sourceMap.SourceNode": true
-      },
-      "packages": {
-        "brfs>static-module>escodegen>estraverse": true,
-        "brfs>static-module>escodegen>source-map": true,
-        "eslint>esutils": true
-      }
-    },
-    "brfs>static-module>magic-string": {
-      "globals": {
-        "Buffer": true,
-        "btoa": true,
-        "console.warn": true
-      },
-      "packages": {
-        "brfs>static-module>magic-string>sourcemap-codec": true
-      }
-    },
-    "brfs>static-module>magic-string>sourcemap-codec": {
-      "globals": {
-        "define": true
-      }
-    },
-    "brfs>static-module>merge-source-map": {
-      "packages": {
-        "brfs>static-module>merge-source-map>source-map": true
-      }
-    },
-    "brfs>static-module>object-inspect": {
-      "builtin": {
-        "util.inspect": true
-      },
-      "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      }
-    },
-    "brfs>static-module>scope-analyzer": {
-      "builtin": {
-        "assert.ok": true,
-        "assert.strictEqual": true
-      },
-      "packages": {
-        "brfs>static-module>scope-analyzer>array-from": true,
-        "brfs>static-module>scope-analyzer>dash-ast": true,
-        "brfs>static-module>scope-analyzer>es6-map": true,
-        "brfs>static-module>scope-analyzer>es6-set": true,
-        "brfs>static-module>scope-analyzer>estree-is-function": true,
-        "brfs>static-module>scope-analyzer>get-assigned-identifiers": true,
-        "resolve-url-loader>es6-iterator>es6-symbol": true
-      }
-    },
-    "brfs>static-module>scope-analyzer>dash-ast": {
-      "builtin": {
-        "assert": true
-      }
-    },
-    "brfs>static-module>scope-analyzer>es6-map": {
-      "packages": {
-        "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": true,
-        "resolve-url-loader>es6-iterator": true,
-        "resolve-url-loader>es6-iterator>d": true,
-        "resolve-url-loader>es6-iterator>es5-ext": true,
-        "resolve-url-loader>es6-iterator>es6-symbol": true
-      }
-    },
-    "brfs>static-module>scope-analyzer>es6-set": {
-      "packages": {
-        "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": true,
-        "resolve-url-loader>es6-iterator": true,
-        "resolve-url-loader>es6-iterator>d": true,
-        "resolve-url-loader>es6-iterator>es5-ext": true,
-        "resolve-url-loader>es6-iterator>es6-symbol": true
-      }
-    },
-    "brfs>static-module>scope-analyzer>get-assigned-identifiers": {
-      "builtin": {
-        "assert.equal": true
-      }
-    },
-    "brfs>static-module>static-eval": {
-      "packages": {
-        "brfs>static-module>static-eval>escodegen": true
-      }
-    },
-    "brfs>static-module>static-eval>escodegen": {
-      "globals": {
-        "sourceMap.SourceNode": true
-      },
-      "packages": {
-        "brfs>static-module>static-eval>escodegen>estraverse": true,
-        "brfs>static-module>static-eval>escodegen>source-map": true,
-        "eslint>esutils": true
-      }
-    },
-    "brfs>static-module>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "readable-stream": true,
-        "watchify>xtend": true
-      }
-    },
-    "brfs>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "readable-stream": true,
-        "watchify>xtend": true
-      }
-    },
     "browserify": {
       "builtin": {
         "events.EventEmitter": true,
@@ -1754,7 +1487,6 @@
         "process.platform": true
       },
       "packages": {
-        "brfs>resolve": true,
         "browserify>browser-pack": true,
         "browserify>browser-resolve": true,
         "browserify>cached-path-relative": true,
@@ -1767,6 +1499,7 @@
         "browserify>shasum-object": true,
         "browserify>syntax-error": true,
         "browserify>through2": true,
+        "depcheck>resolve": true,
         "labeled-stream-splicer": true,
         "lavamoat>htmlescape": true,
         "pumpify>inherits": true,
@@ -1830,7 +1563,7 @@
         "process.platform": true
       },
       "packages": {
-        "brfs>resolve": true
+        "depcheck>resolve": true
       }
     },
     "browserify>cached-path-relative": {
@@ -1894,9 +1627,9 @@
       },
       "packages": {
         "@lavamoat/lavapack>combine-source-map": true,
-        "brfs>static-module>acorn-node": true,
         "browserify>insert-module-globals>through2": true,
         "browserify>insert-module-globals>undeclared-identifiers": true,
+        "browserify>syntax-error>acorn-node": true,
         "gulp-watch>path-is-absolute": true,
         "watchify>xtend": true
       }
@@ -1915,11 +1648,16 @@
     },
     "browserify>insert-module-globals>undeclared-identifiers": {
       "packages": {
-        "brfs>static-module>acorn-node": true,
-        "brfs>static-module>scope-analyzer>get-assigned-identifiers": true,
+        "browserify>insert-module-globals>undeclared-identifiers>get-assigned-identifiers": true,
+        "browserify>syntax-error>acorn-node": true,
         "watchify>xtend": true
       }
     },
+    "browserify>insert-module-globals>undeclared-identifiers>get-assigned-identifiers": {
+      "builtin": {
+        "assert.equal": true
+      }
+    },
     "browserify>module-deps": {
       "builtin": {
         "fs.createReadStream": true,
@@ -1938,7 +1676,6 @@
         "tr": true
       },
       "packages": {
-        "brfs>resolve": true,
         "browserify>browser-resolve": true,
         "browserify>cached-path-relative": true,
         "browserify>concat-stream": true,
@@ -1947,6 +1684,7 @@
         "browserify>module-deps>stream-combiner2": true,
         "browserify>module-deps>through2": true,
         "browserify>parents": true,
+        "depcheck>resolve": true,
         "loose-envify": true,
         "pumpify>inherits": true,
         "readable-stream": true,
@@ -1956,7 +1694,7 @@
     },
     "browserify>module-deps>detective": {
       "packages": {
-        "brfs>static-module>acorn-node": true,
+        "browserify>syntax-error>acorn-node": true,
         "watchify>defined": true
       }
     },
@@ -2022,7 +1760,19 @@
     },
     "browserify>syntax-error": {
       "packages": {
-        "brfs>static-module>acorn-node": true
+        "browserify>syntax-error>acorn-node": true
+      }
+    },
+    "browserify>syntax-error>acorn-node": {
+      "packages": {
+        "@storybook/react>acorn-walk": true,
+        "browserify>syntax-error>acorn-node>acorn": true,
+        "watchify>xtend": true
+      }
+    },
+    "browserify>syntax-error>acorn-node>acorn": {
+      "globals": {
+        "define": true
       }
     },
     "browserify>through2": {
@@ -2388,6 +2138,45 @@
         "console.warn": true
       }
     },
+    "depcheck>resolve": {
+      "builtin": {
+        "fs.readFile": true,
+        "fs.readFileSync": true,
+        "fs.realpath": true,
+        "fs.realpathSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "os.homedir": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.parse": true,
+        "path.relative": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "process.env.HOME": true,
+        "process.env.HOMEDRIVE": true,
+        "process.env.HOMEPATH": true,
+        "process.env.LNAME": true,
+        "process.env.LOGNAME": true,
+        "process.env.USER": true,
+        "process.env.USERNAME": true,
+        "process.env.USERPROFILE": true,
+        "process.getuid": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "process.versions.pnp": true
+      },
+      "packages": {
+        "depcheck>is-core-module": true,
+        "depcheck>resolve>path-parse": true
+      }
+    },
+    "depcheck>resolve>path-parse": {
+      "globals": {
+        "process.platform": true
+      }
+    },
     "duplexify": {
       "globals": {
         "Buffer": true,
@@ -2506,7 +2295,7 @@
         "path.resolve": true
       },
       "packages": {
-        "brfs>resolve": true,
+        "depcheck>resolve": true,
         "eslint-import-resolver-node>debug": true
       }
     },
@@ -2536,8 +2325,8 @@
         "process.cwd": true
       },
       "packages": {
-        "brfs>resolve": true,
         "del>is-glob": true,
+        "depcheck>resolve": true,
         "eslint-plugin-import>tsconfig-paths": true,
         "nock>debug": true,
         "nyc>glob": true
@@ -2852,7 +2641,7 @@
         "process.cwd": true
       },
       "packages": {
-        "brfs>resolve": true,
+        "depcheck>resolve": true,
         "eslint-plugin-node>eslint-plugin-es": true,
         "eslint-plugin-node>eslint-utils": true,
         "eslint-plugin-node>semver": true,
@@ -3015,8 +2804,8 @@
         "process.versions.pnp": true
       },
       "packages": {
-        "brfs>resolve>path-parse": true,
-        "depcheck>is-core-module": true
+        "depcheck>is-core-module": true,
+        "depcheck>resolve>path-parse": true
       }
     },
     "eslint-plugin-react>semver": {
@@ -3378,6 +3167,30 @@
         "chokidar>braces": true
       }
     },
+    "firebase>@firebase/database>faye-websocket>websocket-driver": {
+      "builtin": {
+        "crypto.createHash": true,
+        "crypto.randomBytes": true,
+        "events.EventEmitter": true,
+        "stream.Stream": true,
+        "url.parse": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "Buffer": true,
+        "process.version.match": true
+      },
+      "packages": {
+        "firebase>@firebase/database>faye-websocket>websocket-driver>http-parser-js": true,
+        "firebase>@firebase/database>faye-websocket>websocket-driver>websocket-extensions": true
+      }
+    },
+    "firebase>@firebase/database>faye-websocket>websocket-driver>http-parser-js": {
+      "builtin": {
+        "assert.equal": true,
+        "assert.ok": true
+      }
+    },
     "fs-extra": {
       "builtin": {
         "assert": true,
@@ -3708,31 +3521,7 @@
         "setInterval": true
       },
       "packages": {
-        "gulp-livereload>tiny-lr>faye-websocket>websocket-driver": true
-      }
-    },
-    "gulp-livereload>tiny-lr>faye-websocket>websocket-driver": {
-      "builtin": {
-        "crypto.createHash": true,
-        "crypto.randomBytes": true,
-        "events.EventEmitter": true,
-        "stream.Stream": true,
-        "url.parse": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "Buffer": true,
-        "process.version.match": true
-      },
-      "packages": {
-        "gulp-livereload>tiny-lr>faye-websocket>websocket-driver>http-parser-js": true,
-        "gulp-livereload>tiny-lr>faye-websocket>websocket-driver>websocket-extensions": true
-      }
-    },
-    "gulp-livereload>tiny-lr>faye-websocket>websocket-driver>http-parser-js": {
-      "builtin": {
-        "assert.equal": true,
-        "assert.ok": true
+        "firebase>@firebase/database>faye-websocket>websocket-driver": true
       }
     },
     "gulp-postcss": {
@@ -6085,11 +5874,11 @@
       "packages": {
         "@lavamoat/lavapack": true,
         "@lavamoat/lavapack>json-stable-stringify": true,
-        "@lavamoat/lavapack>lavamoat-core": true,
         "browserify>browser-resolve": true,
         "duplexify": true,
         "lavamoat-browserify>concat-stream": true,
         "lavamoat-browserify>readable-stream": true,
+        "lavamoat-viz>lavamoat-core": true,
         "lavamoat>@lavamoat/aa": true,
         "through2": true
       }
@@ -6125,6 +5914,35 @@
         "readable-stream>util-deprecate": true
       }
     },
+    "lavamoat-viz>lavamoat-core": {
+      "builtin": {
+        "node:events": true,
+        "node:fs.readFileSync": true,
+        "node:fs/promises.writeFile": true,
+        "node:path.extname": true,
+        "node:path.join": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.error": true,
+        "console.warn": true,
+        "define": true
+      },
+      "packages": {
+        "@lavamoat/lavapack>json-stable-stringify": true,
+        "lavamoat-viz>lavamoat-core>lavamoat-tofu": true,
+        "lavamoat>lavamoat-core>merge-deep": true
+      }
+    },
+    "lavamoat-viz>lavamoat-core>lavamoat-tofu": {
+      "globals": {
+        "console.log": true
+      },
+      "packages": {
+        "depcheck>@babel/traverse": true,
+        "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/parser": true
+      }
+    },
     "lavamoat>@lavamoat/aa": {
       "builtin": {
         "fs.readFileSync": true,
@@ -6133,7 +5951,7 @@
         "path.relative": true
       },
       "packages": {
-        "brfs>resolve": true
+        "depcheck>resolve": true
       }
     },
     "lavamoat>lavamoat-core>merge-deep": {
@@ -7611,7 +7429,6 @@
     },
     "string.prototype.matchall>es-abstract": {
       "packages": {
-        "brfs>static-module>object-inspect": true,
         "browserify>has": true,
         "eslint-plugin-react>array-includes>is-string": true,
         "string.prototype.matchall>call-bind": true,
@@ -7622,6 +7439,7 @@
         "string.prototype.matchall>es-abstract>has-proto": true,
         "string.prototype.matchall>es-abstract>is-callable": true,
         "string.prototype.matchall>es-abstract>is-regex": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
         "string.prototype.matchall>es-abstract>safe-regex-test": true,
         "string.prototype.matchall>es-abstract>string.prototype.trim": true,
         "string.prototype.matchall>get-intrinsic": true,
@@ -7669,6 +7487,15 @@
         "string.prototype.matchall>call-bind": true
       }
     },
+    "string.prototype.matchall>es-abstract>object-inspect": {
+      "builtin": {
+        "util.inspect": true
+      },
+      "globals": {
+        "HTMLElement": true,
+        "WeakRef": true
+      }
+    },
     "string.prototype.matchall>es-abstract>safe-regex-test": {
       "packages": {
         "string.prototype.matchall>call-bind": true,
@@ -7720,8 +7547,8 @@
     },
     "string.prototype.matchall>side-channel": {
       "packages": {
-        "brfs>static-module>object-inspect": true,
         "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
         "string.prototype.matchall>get-intrinsic": true
       }
     },
@@ -8467,10 +8294,9 @@
       }
     },
     "terser>@jridgewell/source-map": {
-      "globals": {
-        "Buffer": true,
-        "TextDecoder": true,
-        "define": true
+      "packages": {
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true,
+        "terser>@jridgewell/source-map>@jridgewell/trace-mapping": true
       }
     },
     "terser>@jridgewell/source-map>@jridgewell/gen-mapping": {
@@ -8695,7 +8521,6 @@
         "crypto": true,
         "fs": true,
         "inspector": true,
-        "module.findPnpApi": true,
         "os.EOL": true,
         "os.platform": true,
         "path.dirname": true,
diff --git a/offscreen/offscreen.html b/offscreen/offscreen.html
index 7290b9b945c5..ea5ad76dd7a7 100644
--- a/offscreen/offscreen.html
+++ b/offscreen/offscreen.html
@@ -5,10 +5,6 @@
     <title>MetaMask Offscreen Page</title>
   </head>
   <body>
-    <script type="text/javascript" src="./load-offscreen.js"></script>
-    <iframe
-      src="https://metamask.github.io/eth-ledger-bridge-keyring"
-      allow="hid"
-    ></iframe>
+    <script src="./load-offscreen.js"></script>
   </body>
 </html>
diff --git a/offscreen/scripts/callback-processor.ts b/offscreen/scripts/callback-processor.ts
index 83b062811173..36fa3ae9f9c4 100644
--- a/offscreen/scripts/callback-processor.ts
+++ b/offscreen/scripts/callback-processor.ts
@@ -11,8 +11,12 @@
 export class CallbackProcessor {
   currentMessageId = 0;
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   messageCallbacks = new Map<number, (response?: any) => void>();
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   registerCallback(callback: (response?: any) => void) {
     this.currentMessageId += 1;
     this.messageCallbacks.set(this.currentMessageId, callback);
diff --git a/offscreen/scripts/ledger.ts b/offscreen/scripts/ledger.ts
index 6ed42b0dc858..9fe1f4f10c37 100644
--- a/offscreen/scripts/ledger.ts
+++ b/offscreen/scripts/ledger.ts
@@ -17,7 +17,10 @@ const LEDGER_KEYRING_IFRAME_CONNECTED_EVENT = 'ledger-connection-event';
 const callbackProcessor = new CallbackProcessor();
 
 export default function init() {
-  const iframe = document.querySelector('iframe');
+  const iframe = document.createElement('iframe');
+  iframe.src = 'https://metamask.github.io/eth-ledger-bridge-keyring';
+  iframe.allow = 'hid';
+  document.body.appendChild(iframe);
   // This listener receives action responses from the live ledger iframe
   // Then forwards the response to the offscreen bridge
   window.addEventListener('message', ({ origin, data, source }) => {
@@ -50,6 +53,8 @@ export default function init() {
       msg: {
         target: string;
         action: LedgerAction;
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         params: any;
       },
       _sender,
diff --git a/offscreen/scripts/trezor.ts b/offscreen/scripts/trezor.ts
index 34274be8652c..e9482a03c575 100644
--- a/offscreen/scripts/trezor.ts
+++ b/offscreen/scripts/trezor.ts
@@ -18,6 +18,8 @@ export default function init() {
       msg: {
         target: string;
         action: TrezorAction;
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         params: any;
       },
       _sender,
diff --git a/package.json b/package.json
index 684d7ca7098b..00755af255d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.14.4",
+  "version": "11.17.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -8,14 +8,14 @@
   },
   "scripts": {
     "start": "yarn build:dev dev --apply-lavamoat=false --snow=false",
-    "start:mv3": "ENABLE_MV3=true yarn build:dev dev --apply-lavamoat=false",
+    "start:mv3": "ENABLE_MV3=true yarn build:dev dev --apply-lavamoat=false --snow=false",
     "start:flask": "yarn start --build-type flask",
     "start:mmi": "yarn start --build-type mmi",
     "start:lavamoat": "yarn build:dev dev --apply-lavamoat=true",
     "dist": "yarn build dist",
     "dist:mv3": "ENABLE_MV3=true yarn build dist",
     "dist:mmi": "yarn dist --build-type mmi",
-    "dist:mmi:debug": "yarn dist --build-type mmi --apply-lavamoat=false",
+    "dist:mmi:debug": "yarn dist --build-type mmi --apply-lavamoat=false --snow=false",
     "build": "yarn lavamoat:build",
     "build:dev": "node development/build/index.js",
     "start:test": "BLOCKAID_FILE_CDN=static.cx.metamask.io/api/v1/confirmations/ppom SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --apply-lavamoat=false --snow=false",
@@ -96,6 +96,7 @@
     "lavamoat:build": "lavamoat development/build/index.js --policy lavamoat/build-system/policy.json --policyOverride lavamoat/build-system/policy-override.json",
     "lavamoat:build:auto": "yarn lavamoat:build --writeAutoPolicy",
     "lavamoat:debug:build": "yarn lavamoat:build --writeAutoPolicyDebug --policydebug lavamoat/build-system/policy-debug.json",
+    "lavamoat:debug:webapp": "WRITE_AUTO_POLICY_DEBUG=1 yarn lavamoat:webapp:auto",
     "lavamoat:webapp:auto": "node ./development/generate-lavamoat-policies.js --devMode=true",
     "lavamoat:webapp:auto:ci": "node ./development/generate-lavamoat-policies.js --parallel=false",
     "lavamoat:auto": "yarn lavamoat:build:auto && yarn lavamoat:webapp:auto",
@@ -116,7 +117,8 @@
     "audit": "yarn npm audit --recursive --environment production --severity moderate --ignore '@metamask/types (deprecation)'",
     "download-builds": "tsx .devcontainer/download-builds.ts prep-build",
     "download-builds:test": "tsx .devcontainer/download-builds.ts prep-build-test",
-    "master-sync": "node development/master-sync.js"
+    "master-sync": "node development/master-sync.js",
+    "update-mock-cdn": "node test/e2e/mock-cdn/update-mock-cdn-files.js"
   },
   "resolutions": {
     "simple-update-notifier@^1.0.0": "^2.0.0",
@@ -211,7 +213,7 @@
     "nonce-tracker@npm:^3.0.0": "patch:nonce-tracker@npm%3A3.0.0#~/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch",
     "@trezor/schema-utils@npm:1.0.1": "patch:@trezor/schema-utils@npm%3A1.0.1#~/.yarn/patches/@trezor-schema-utils-npm-1.0.1-70c2a68232.patch",
     "lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch",
-    "@metamask/snaps-sdk": "^3.1.1",
+    "@metamask/snaps-sdk": "^4.0.1",
     "@babel/runtime@npm:^7.7.6": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@babel/runtime@npm:^7.9.2": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@babel/runtime@npm:^7.12.5": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
@@ -232,19 +234,23 @@
     "@babel/runtime@npm:^7.18.3": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@babel/runtime@npm:^7.8.3": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@babel/runtime@npm:^7.8.4": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
-    "@metamask/network-controller@npm:^17.2.0": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
-    "@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
-    "@metamask/network-controller@npm:^15.0.0": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
-    "@metamask/network-controller@npm:^18.0.1": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
-    "@metamask/network-controller@npm:^17.2.1": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
-    "@metamask/keyring-controller@npm:^13.0.0": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch",
-    "@metamask/gas-fee-controller@npm:^14.0.1": "patch:@metamask/gas-fee-controller@npm%3A14.0.1#~/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch"
+    "@metamask/network-controller@npm:^17.2.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch",
+    "@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch",
+    "@metamask/network-controller@npm:^15.0.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch",
+    "@metamask/network-controller@npm:^18.0.1": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch",
+    "@metamask/network-controller@npm:^17.2.1": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch",
+    "@metamask/network-controller@npm:^18.1.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch",
+    "@metamask/keyring-controller@npm:^13.0.0": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch",
+    "@metamask/keyring-controller@npm:^12.2.0": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch",
+    "@metamask/keyring-controller@npm:^14.0.1": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch",
+    "@spruceid/siwe-parser@npm:1.1.3": "patch:@spruceid/siwe-parser@npm%3A2.1.0#~/.yarn/patches/@spruceid-siwe-parser-npm-2.1.0-060b7ede7a.patch",
+    "@spruceid/siwe-parser@npm:2.1.0": "patch:@spruceid/siwe-parser@npm%3A2.1.0#~/.yarn/patches/@spruceid-siwe-parser-npm-2.1.0-060b7ede7a.patch"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@blockaid/ppom_release": "^1.4.6",
+    "@contentful/rich-text-html-renderer": "^16.3.5",
     "@ensdomains/content-hash": "^2.5.7",
-    "@ethereumjs/common": "^3.1.1",
     "@ethereumjs/tx": "^4.1.1",
     "@ethersproject/abi": "^5.6.4",
     "@ethersproject/bignumber": "^5.7.0",
@@ -257,30 +263,29 @@
     "@lavamoat/lavadome-react": "0.0.17",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@metamask-institutional/custody-controller": "^0.2.23",
-    "@metamask-institutional/custody-keyring": "^1.0.11",
-    "@metamask-institutional/extension": "^0.3.19",
-    "@metamask-institutional/institutional-features": "^1.2.14",
-    "@metamask-institutional/portfolio-dashboard": "^1.4.0",
-    "@metamask-institutional/rpc-allowlist": "^1.0.2",
-    "@metamask-institutional/sdk": "^0.1.25",
-    "@metamask-institutional/transaction-update": "^0.1.37",
+    "@metamask-institutional/custody-controller": "^0.2.27",
+    "@metamask-institutional/custody-keyring": "^2.0.0",
+    "@metamask-institutional/extension": "^0.3.24",
+    "@metamask-institutional/institutional-features": "^1.3.2",
+    "@metamask-institutional/portfolio-dashboard": "^1.4.1",
+    "@metamask-institutional/rpc-allowlist": "^1.0.3",
+    "@metamask-institutional/sdk": "^0.1.26",
+    "@metamask-institutional/transaction-update": "^0.2.2",
     "@metamask/abi-utils": "^2.0.2",
     "@metamask/accounts-controller": "^11.0.0",
-    "@metamask/address-book-controller": "^3.1.7",
-    "@metamask/announcement-controller": "^5.0.1",
-    "@metamask/approval-controller": "^6.0.0",
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch",
+    "@metamask/address-book-controller": "^4.0.1",
+    "@metamask/announcement-controller": "^6.1.0",
+    "@metamask/approval-controller": "^6.0.1",
+    "@metamask/assets-controllers": "^29.0.0",
     "@metamask/base-controller": "^4.1.0",
     "@metamask/browser-passworder": "^4.3.0",
-    "@metamask/contract-metadata": "^2.3.1",
-    "@metamask/controller-utils": "patch:@metamask/controller-utils@npm%3A8.0.4#~/.yarn/patches/@metamask-controller-utils-npm-8.0.4-077edd6162.patch",
+    "@metamask/contract-metadata": "^2.5.0",
+    "@metamask/controller-utils": "^9.1.0",
     "@metamask/design-tokens": "^2.1.1",
     "@metamask/desktop": "^0.3.0",
     "@metamask/ens-controller": "^9.0.0",
     "@metamask/eth-json-rpc-filters": "^7.0.0",
     "@metamask/eth-json-rpc-middleware": "^12.1.0",
-    "@metamask/eth-keyring-controller": "^16.0.0",
     "@metamask/eth-ledger-bridge-keyring": "^2.0.1",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/eth-sig-util": "^7.0.1",
@@ -291,40 +296,42 @@
     "@metamask/ethjs": "^0.6.0",
     "@metamask/ethjs-contract": "^0.4.1",
     "@metamask/ethjs-query": "^0.7.1",
-    "@metamask/gas-fee-controller": "patch:@metamask/gas-fee-controller@npm%3A14.0.1#~/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch",
+    "@metamask/gas-fee-controller": "^15.0.0",
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/keyring-api": "^3.0.0",
-    "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch",
+    "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch",
     "@metamask/logging-controller": "^2.0.2",
     "@metamask/logo": "^3.1.2",
     "@metamask/message-manager": "^7.3.0",
+    "@metamask/message-signing-snap": "^0.3.3",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/name-controller": "^4.2.0",
-    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch",
+    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch",
     "@metamask/notification-controller": "^3.0.0",
     "@metamask/obs-store": "^8.1.0",
-    "@metamask/permission-controller": "^8.0.0",
+    "@metamask/permission-controller": "^9.0.1",
     "@metamask/permission-log-controller": "^1.0.0",
-    "@metamask/phishing-controller": "^8.0.0",
+    "@metamask/phishing-controller": "^9.0.2",
     "@metamask/post-message-stream": "^8.0.0",
-    "@metamask/ppom-validator": "^0.29.0",
+    "@metamask/ppom-validator": "^0.30.0",
     "@metamask/providers": "^14.0.2",
-    "@metamask/queued-request-controller": "^0.6.0",
+    "@metamask/queued-request-controller": "^0.10.0",
     "@metamask/rate-limit-controller": "^3.0.0",
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
-    "@metamask/selected-network-controller": "^9.0.0",
+    "@metamask/selected-network-controller": "^13.0.0",
     "@metamask/signature-controller": "^12.0.0",
-    "@metamask/smart-transactions-controller": "^6.2.2",
-    "@metamask/snaps-controllers": "^6.0.3",
-    "@metamask/snaps-execution-environments": "^5.0.3",
-    "@metamask/snaps-rpc-methods": "^7.0.1",
-    "@metamask/snaps-sdk": "^3.1.1",
-    "@metamask/snaps-utils": "^7.1.0",
-    "@metamask/transaction-controller": "^27.0.1",
-    "@metamask/user-operation-controller": "^6.0.0",
+    "@metamask/smart-transactions-controller": "^10.0.1",
+    "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch",
+    "@metamask/snaps-execution-environments": "^6.0.2",
+    "@metamask/snaps-rpc-methods": "^8.0.0",
+    "@metamask/snaps-sdk": "^4.0.1",
+    "@metamask/snaps-utils": "^7.1.1",
+    "@metamask/transaction-controller": "^29.0.0",
+    "@metamask/user-operation-controller": "^8.0.1",
     "@metamask/utils": "^8.2.1",
     "@ngraveio/bc-ur": "^1.1.12",
+    "@noble/ciphers": "^0.5.2",
     "@noble/hashes": "^1.3.3",
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "^1.6.2",
@@ -340,10 +347,11 @@
     "base32-encode": "^1.2.0",
     "base64-js": "^1.5.1",
     "bignumber.js": "^4.1.0",
-    "blo": "1.1.1",
+    "blo": "1.2.0",
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
     "classnames": "^2.2.6",
+    "contentful": "^10.8.7",
     "copy-to-clipboard": "^3.3.3",
     "currency-formatter": "^1.4.2",
     "debounce-stream": "^2.0.0",
@@ -357,6 +365,7 @@
     "ethereumjs-util": "^7.0.10",
     "extension-port-stream": "^3.0.0",
     "fast-json-patch": "^3.1.1",
+    "firebase": "^10.11.0",
     "fuse.js": "^3.2.0",
     "human-standard-token-abi": "^2.0.0",
     "immer": "^9.0.6",
@@ -403,7 +412,7 @@
     "single-call-balance-checker-abi": "^1.0.0",
     "unicode-confusables": "^0.1.1",
     "uuid": "^8.3.2",
-    "web3-stream-provider": "^4.0.0",
+    "web3-stream-provider": "^5.0.0",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
@@ -429,10 +438,12 @@
     "@metamask/eslint-config-mocha": "^9.0.0",
     "@metamask/eslint-config-nodejs": "^9.0.0",
     "@metamask/eslint-config-typescript": "^9.0.1",
+    "@metamask/eslint-plugin-design-tokens": "^1.1.0",
     "@metamask/forwarder": "^1.1.0",
     "@metamask/phishing-warning": "^3.0.3",
     "@metamask/test-bundler": "^1.0.0",
     "@metamask/test-dapp": "^8.4.0",
+    "@octokit/core": "^3.6.0",
     "@playwright/test": "^1.39.0",
     "@sentry/cli": "^2.19.4",
     "@storybook/addon-a11y": "^7.4.6",
@@ -494,7 +505,6 @@
     "axios": "^1.1.3",
     "babelify": "^10.0.0",
     "bify-module-groups": "^2.0.0",
-    "brfs": "^2.0.2",
     "browserify": "^17.0.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -554,7 +564,7 @@
     "koa": "^2.7.0",
     "lavamoat": "^8.0.2",
     "lavamoat-browserify": "^17.0.4",
-    "lavamoat-viz": "^7.0.2",
+    "lavamoat-viz": "^7.0.5",
     "lockfile-lint": "^4.10.6",
     "loose-envify": "^1.4.0",
     "mocha": "^10.2.0",
@@ -563,7 +573,6 @@
     "nock": "^13.2.9",
     "node-fetch": "^2.6.1",
     "nyc": "^15.1.0",
-    "polyfill-crypto.getrandomvalues": "^1.0.0",
     "postcss": "^8.4.32",
     "postcss-rtlcss": "^4.0.9",
     "prettier": "^2.7.1",
@@ -599,7 +608,7 @@
     "ts-node": "^10.9.2",
     "tsx": "^4.7.1",
     "ttest": "^2.1.1",
-    "typescript": "~5.3.3",
+    "typescript": "~5.4.5",
     "vinyl": "^2.2.1",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
@@ -607,7 +616,7 @@
     "wait-on": "^7.0.1",
     "watchify": "^4.0.0",
     "webextension-polyfill": "^0.8.0",
-    "webpack": "^5.75.0",
+    "webpack": "^5.91.0",
     "yaml": "^2.4.1",
     "yargs": "^17.7.2"
   },
@@ -675,7 +684,8 @@
       "@trezor/connect-web>@trezor/connect>@trezor/utxo-lib>tiny-secp256k1": false,
       "@storybook/test-runner>@swc/core": false,
       "@lavamoat/lavadome-react>@lavamoat/preinstall-always-fail": false,
-      "tsx>esbuild": false
+      "tsx>esbuild": false,
+      "firebase>@firebase/firestore>@grpc/proto-loader>protobufjs": false
     }
   },
   "packageManager": "yarn@4.0.2"
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index fde6d795267a..beabfddc3e95 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -7,6 +7,7 @@
   "bafkreifvhjdf6ve4jfv6qytqtux5nd4nwnelioeiqx5x2ez5yrgrzk7ypi.ipfs.dweb.link",
   "bafybeidxfmwycgzcp4v2togflpqh2gnibuexjy4m4qqwxp7nh3jx5zlh4y.ipfs.dweb.link",
   "cdn.segment.com",
+  "cdn.segment.io",
   "cdnjs.cloudflare.com",
   "chainid.network",
   "configuration.dev.metamask-institutional.io",
@@ -17,7 +18,7 @@
   "etherscan.io",
   "execution.metamask.io",
   "fonts.gstatic.com",
-  "gas.api.cx.metamask.io",
+  "gas.api.infura.io",
   "github.com",
   "goerli.infura.io",
   "localhost:8000",
@@ -25,6 +26,7 @@
   "mainnet.infura.io",
   "metamask.github.io",
   "min-api.cryptocompare.com",
+  "nft.api.cx.metamask.io",
   "phishing-detection.metafi.codefi.network",
   "portfolio.metamask.io",
   "price-api.metafi.codefi.network",
@@ -33,6 +35,7 @@
   "registry.npmjs.org",
   "responsive-rpc.url",
   "sentry.io",
+  "snaps.metamask.io",
   "start.metamask.io",
   "static.cx.metamask.io",
   "static.metafi-dev.codefi.network",
diff --git a/shared/constants/app.ts b/shared/constants/app.ts
index e2c3412496ed..db176b8bbe93 100644
--- a/shared/constants/app.ts
+++ b/shared/constants/app.ts
@@ -35,7 +35,9 @@ export const MESSAGE_TYPE = {
   ETH_GET_BLOCK_BY_NUMBER: 'eth_getBlockByNumber',
   ETH_REQUEST_ACCOUNTS: 'eth_requestAccounts',
   ETH_SIGN: 'eth_sign',
+  ETH_SIGN_TRANSACTION: 'eth_signTransaction',
   ETH_SIGN_TYPED_DATA: 'eth_signTypedData',
+  ETH_SIGN_TYPED_DATA_V1: 'eth_signTypedData_v1',
   ETH_SIGN_TYPED_DATA_V3: 'eth_signTypedData_v3',
   ETH_SIGN_TYPED_DATA_V4: 'eth_signTypedData_v4',
   GET_PROVIDER_STATE: 'metamask_getProviderState',
@@ -81,6 +83,11 @@ export const SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES = {
 };
 ///: END:ONLY_INCLUDE_IF
 
+export const SMART_TRANSACTION_CONFIRMATION_TYPES = {
+  showSmartTransactionStatusPage:
+    'smartTransaction:showSmartTransactionStatusPage',
+};
+
 /**
  * Custom messages to send and be received by the extension
  */
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index cd5a89e8aadf..fd571b5ebfe0 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -499,6 +499,7 @@ export enum MetaMetricsEventName {
   AccountAdded = 'Account Added',
   AccountAddSelected = 'Account Add Selected',
   AccountAddFailed = 'Account Add Failed',
+  AccountDetailsOpened = 'Account Details Opened',
   AccountPasswordCreated = 'Account Password Created',
   AccountReset = 'Account Reset',
   AccountRenamed = 'Account Renamed',
@@ -539,7 +540,6 @@ export enum MetaMetricsEventName {
   MetricsOptIn = 'Metrics Opt In',
   MetricsOptOut = 'Metrics Opt Out',
   NavAccountMenuOpened = 'Account Menu Opened',
-  NavAccountDetailsOpened = 'Account Details Opened',
   NavConnectedSitesOpened = 'Connected Sites Opened',
   NavMainMenuOpened = 'Main Menu Opened',
   NavPermissionsOpened = 'Permissions Opened',
@@ -610,6 +610,8 @@ export enum MetaMetricsEventName {
   TokenImportButtonClicked = 'Import Token Button Clicked',
   TokenScreenOpened = 'Token Screen Opened',
   TokenAdded = 'Token Added',
+  TokenRemoved = 'Token Removed',
+  NFTRemoved = 'NFT Removed',
   TokenDetected = 'Token Detected',
   TokenHidden = 'Token Hidden',
   TokenImportCanceled = 'Token Import Canceled',
@@ -645,6 +647,7 @@ export enum MetaMetricsEventName {
   CustomNetworkAdded = 'Custom Network Added',
   TokenDetailsOpened = 'Token Details Opened',
   NftScreenOpened = 'NFT Screen Opened',
+  NftDetailsOpened = 'NFT Details Opened',
   ActivityScreenOpened = 'Activity Screen Opened',
   WhatsNewViewed = `What's New Viewed`,
   WhatsNewClicked = `What's New Link Clicked`,
@@ -783,6 +786,7 @@ export enum MetaMetricsTransactionEventSource {
 }
 
 export enum MetaMetricsEventLocation {
+  SignatureConfirmation = 'signature_confirmation',
   TokenDetails = 'token_details',
   TokenDetection = 'token_detection',
   TokenMenu = 'token_menu',
@@ -793,6 +797,7 @@ export enum MetaMetricsEventUiCustomization {
   FlaggedAsSafetyUnknown = 'flagged_as_safety_unknown',
   FlaggedAsWarning = 'flagged_as_warning',
   GasEstimationFailed = 'gas_estimation_failed',
+  RedesignedConfirmation = 'redesigned_confirmation',
   SecurityAlertError = 'security_alert_error',
   Siwe = 'sign_in_with_ethereum',
 }
diff --git a/shared/constants/methods-tags.ts b/shared/constants/methods-tags.ts
new file mode 100644
index 000000000000..d6802df4e8c0
--- /dev/null
+++ b/shared/constants/methods-tags.ts
@@ -0,0 +1,32 @@
+/**
+ * This is a list of methods that require the globally selected network
+ * to match the dapp selected network before being processed. These can
+ * be for UI/UX reasons where the currently selected network is displayed
+ * in the confirmation even though it will be submitted on the correct
+ * network for the dapp. It could also be that a method expects the
+ * globally selected network to match some value in the request params itself.
+ */
+export const methodsRequiringNetworkSwitch = [
+  'eth_sendTransaction',
+  'eth_sendRawTransaction',
+  'wallet_switchEthereumChain',
+  'wallet_addEthereumChain',
+  'wallet_watchAsset',
+  'eth_signTypedData_v4',
+  'personal_sign',
+];
+
+/**
+ * This is a list of methods that can cause a confirmation to be
+ * presented to the user. Note that some of these methods may
+ * only sometimes cause a confirmation to appear.
+ */
+export const methodsWithConfirmation = [
+  ...methodsRequiringNetworkSwitch,
+  'wallet_requestPermissions',
+  'wallet_requestSnaps',
+  'eth_decrypt',
+  'eth_sign',
+  'eth_requestAccounts',
+  'eth_getEncryptionPublicKey',
+];
diff --git a/shared/constants/mmi-controller.ts b/shared/constants/mmi-controller.ts
index 779c1aa99368..16ea5e53df42 100644
--- a/shared/constants/mmi-controller.ts
+++ b/shared/constants/mmi-controller.ts
@@ -11,31 +11,53 @@ import MetaMetricsController from '../../app/scripts/controllers/metametrics';
 
 export type MMIControllerOptions = {
   mmiConfigurationController: MmiConfigurationController;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   keyringController: any;
   preferencesController: PreferencesController;
   appStateController: AppStateController;
   transactionUpdateController: TransactionUpdateController;
   custodyController: CustodyController;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   messenger: any;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getState: () => any;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getPendingNonce: (address: string) => Promise<any>;
   accountTracker: AccountTracker;
   metaMetricsController: MetaMetricsController;
   networkController: NetworkController;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   permissionController: any;
   signatureController: SignatureController;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   platform: any;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   extension: any;
   updateTransactionHash: (txId: string, txHash: string) => void;
   trackTransactionEvents: (
     args: { transactionMeta: TransactionMeta },
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     event: any,
   ) => void;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getTransactions: (query?: any, opts?: any, fullTx?: boolean) => any[];
   setTxStatusSigned: (txId: string) => void;
   setTxStatusSubmitted: (txId: string) => void;
   setTxStatusFailed: (txId: string) => void;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   updateTransaction: (txMeta: any) => void;
+  setChannelId: (channelId: string) => void;
+  setConnectionRequest: (payload: ConnectionRequest | null) => void;
 };
 
 export type ISignedEvent = {
@@ -69,3 +91,9 @@ export type NetworkConfiguration = {
   chainId: string;
   setActiveNetwork: (chainId: string) => void;
 };
+
+export type ConnectionRequest = {
+  payload: string;
+  traceId: string;
+  channelId: string;
+};
diff --git a/shared/constants/network.test.ts b/shared/constants/network.test.ts
index 0c4f50b87b7f..ac427914fbaa 100644
--- a/shared/constants/network.test.ts
+++ b/shared/constants/network.test.ts
@@ -3,6 +3,7 @@ import { join } from 'path';
 import {
   CHAIN_IDS,
   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  FEATURED_RPCS,
   NETWORK_TO_NAME_MAP,
 } from './network';
 
@@ -24,4 +25,70 @@ describe('NetworkConstants', () => {
     expect(NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM]).toBe('OP Mainnet');
     expect(NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON]).toBe('Polygon');
   });
+  describe('popularNetwork', () => {
+    it('should have correct chainIds for all popular network', () => {
+      const expectedChainIds: { [key: string]: string } = {
+        'Arbitrum One': CHAIN_IDS.ARBITRUM,
+        'Avalanche Network C-Chain': CHAIN_IDS.AVALANCHE,
+        'BNB Chain': CHAIN_IDS.BSC,
+        'OP Mainnet': CHAIN_IDS.OPTIMISM,
+        'Polygon Mainnet': CHAIN_IDS.POLYGON,
+        'zkSync Era Mainnet': CHAIN_IDS.ZKSYNC_ERA,
+        'Base Mainnet': CHAIN_IDS.BASE,
+      };
+
+      FEATURED_RPCS.forEach((rpc) => {
+        expect(rpc.chainId).toBe(expectedChainIds[rpc.nickname]);
+      });
+    });
+  });
+
+  describe('FEATURED_RPCS Infura Usage Tests', () => {
+    it('arbitrum entry should use Infura', () => {
+      const arbitrumRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.ARBITRUM,
+      );
+      expect(arbitrumRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('avalanche entry should use Infura', () => {
+      const avalancheRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.AVALANCHE,
+      );
+      expect(avalancheRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('bsc entry should not use Infura', () => {
+      const bscRpc = FEATURED_RPCS.find((rpc) => rpc.chainId === CHAIN_IDS.BSC);
+      expect(bscRpc?.rpcUrl).not.toContain('infura.io');
+    });
+
+    it('optimism entry should use Infura', () => {
+      const optimismRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.OPTIMISM,
+      );
+      expect(optimismRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('polygon entry should use Infura', () => {
+      const polygonRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.POLYGON,
+      );
+      expect(polygonRpc?.rpcUrl).toContain('infura.io');
+    });
+
+    it('zkSync Era entry should not use Infura', () => {
+      const zksyncEraRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.ZKSYNC_ERA,
+      );
+      expect(zksyncEraRpc?.rpcUrl).not.toContain('infura.io');
+    });
+
+    it('base entry should not use Infura', () => {
+      const baseRpc = FEATURED_RPCS.find(
+        (rpc) => rpc.chainId === CHAIN_IDS.BASE,
+      );
+      expect(baseRpc?.rpcUrl).not.toContain('infura.io');
+    });
+  });
 });
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 8aba942052c7..16c0fa82fcd2 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -150,6 +150,12 @@ export const CHAIN_IDS = {
   TEST_ETH: '0x539',
   ARBITRUM_GOERLI: '0x66eed',
   BLAST: '0x13e31',
+  FILECOIN: '0x13a',
+  POLYGON_ZKEVM: '0x44d',
+  SCROLL: '0x82750',
+  SCROLL_SEPOLIA: '0x8274f',
+  WETHIO: '0x4e',
+  CHZ: '0x15b38',
 } as const;
 
 const CHAINLIST_CHAIN_IDS_MAP = {
@@ -191,7 +197,6 @@ const CHAINLIST_CHAIN_IDS_MAP = {
   OASYS_MAINNET: '0xf8',
   OKXCHAIN_MAINNET: '0x42',
   PGN_PUBLIC_GOODS_NETWORK: '0x1a8',
-  POLYGON_ZKEVM: '0x44d',
   PULSECHAIN_MAINNET: '0x171',
   SHARDEUM_LIBERTY_2X: '0x1f91',
   SHARDEUM_SPHINX_1X: '0x1f92',
@@ -203,6 +208,7 @@ const CHAINLIST_CHAIN_IDS_MAP = {
   VELAS_EVM_MAINNET: '0x6a',
   ZKATANA: '0x133e40',
   ZORA_MAINNET: '0x76adf1',
+  FILECOIN: '0x13a',
 } as const;
 
 // To add a deprecation warning to a network, add it to the array
@@ -244,6 +250,13 @@ export const GNOSIS_DISPLAY_NAME = 'Gnosis';
 export const ZK_SYNC_ERA_DISPLAY_NAME = 'zkSync Era Mainnet';
 export const BASE_DISPLAY_NAME = 'Base Mainnet';
 export const AURORA_ETH_DISPLAY_NAME = 'Aurora';
+export const CRONOS_DISPLAY_NAME = 'Cronos';
+export const POLYGON_ZKEVM_DISPLAY_NAME = 'Polygon zkEVM';
+export const MOONBEAM_DISPLAY_NAME = 'Moonbeam';
+export const MOONRIVER_DISPLAY_NAME = 'Moonriver';
+export const SCROLL_DISPLAY_NAME = 'Scroll';
+export const SCROLL_SEPOLIA_DISPLAY_NAME = 'Scroll Sepolia';
+export const OP_BNB_DISPLAY_NAME = 'opBNB';
 
 export const infuraProjectId = process.env.INFURA_PROJECT_ID;
 export const getRpcUrl = ({
@@ -358,6 +371,11 @@ const CHAINLIST_CURRENCY_SYMBOLS_MAP = {
   ACALA_NETWORK: 'ACA',
 } as const;
 
+export const CHAINLIST_CURRENCY_SYMBOLS_MAP_NETWORK_COLLISION = {
+  WETHIO: 'ZYN',
+  CHZ: 'CHZ',
+};
+
 export const ETH_TOKEN_IMAGE_URL = './images/eth_logo.svg';
 export const LINEA_GOERLI_TOKEN_IMAGE_URL = './images/linea-logo-testnet.png';
 export const LINEA_SEPOLIA_TOKEN_IMAGE_URL = './images/linea-logo-testnet.png';
@@ -419,18 +437,18 @@ export const TENET_MAINNET_IMAGE_URL = './images/tenet.svg';
 export const VELAS_EVM_MAINNET_IMAGE_URL = './images/velas.svg';
 export const ZKATANA_MAINNET_IMAGE_URL = './images/zkatana.png';
 export const ZORA_MAINNET_IMAGE_URL = './images/zora.svg';
+export const FILECOIN_MAINNET_IMAGE_URL = './images/filecoin.svg';
+export const SCROLL_IMAGE_URL = './images/scroll.svg';
 
 export const INFURA_PROVIDER_TYPES = [
   NETWORK_TYPES.MAINNET,
   NETWORK_TYPES.SEPOLIA,
-  NETWORK_TYPES.LINEA_GOERLI,
   NETWORK_TYPES.LINEA_SEPOLIA,
   NETWORK_TYPES.LINEA_MAINNET,
 ] as const;
 
 export const TEST_CHAINS = [
   CHAIN_IDS.SEPOLIA,
-  CHAIN_IDS.LINEA_GOERLI,
   CHAIN_IDS.LINEA_SEPOLIA,
   CHAIN_IDS.LOCALHOST,
 ];
@@ -468,11 +486,6 @@ export const BUILT_IN_NETWORKS = {
     ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
     blockExplorerUrl: `https://${NETWORK_TYPES.SEPOLIA}.etherscan.io`,
   },
-  [NETWORK_TYPES.LINEA_GOERLI]: {
-    chainId: CHAIN_IDS.LINEA_GOERLI,
-    ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
-    blockExplorerUrl: 'https://goerli.lineascan.build',
-  },
   [NETWORK_TYPES.LINEA_SEPOLIA]: {
     chainId: CHAIN_IDS.LINEA_SEPOLIA,
     ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
@@ -527,7 +540,10 @@ export const NETWORK_TO_NAME_MAP = {
   [CHAIN_IDS.LOCALHOST]: LOCALHOST_DISPLAY_NAME,
   [CHAIN_IDS.OPTIMISM]: OPTIMISM_DISPLAY_NAME,
   [CHAIN_IDS.POLYGON]: POLYGON_DISPLAY_NAME,
+  [CHAIN_IDS.SCROLL]: SCROLL_DISPLAY_NAME,
+  [CHAIN_IDS.SCROLL_SEPOLIA]: SCROLL_SEPOLIA_DISPLAY_NAME,
   [CHAIN_IDS.SEPOLIA]: SEPOLIA_DISPLAY_NAME,
+  [CHAIN_IDS.OPBNB]: OP_BNB_DISPLAY_NAME,
 } as const;
 
 export const CHAIN_ID_TO_CURRENCY_SYMBOL_MAP = {
@@ -644,6 +660,23 @@ export const CHAIN_ID_TO_CURRENCY_SYMBOL_MAP = {
     CHAINLIST_CURRENCY_SYMBOLS_MAP.ACALA_NETWORK,
 } as const;
 
+/**
+ * A mapping for networks with chain ID collisions to their currencies symbols.
+ * Useful for networks not listed on https://chainid.network/chains.json due to ID conflicts.
+ */
+export const CHAIN_ID_TO_CURRENCY_SYMBOL_MAP_NETWORK_COLLISION = {
+  [CHAINLIST_CHAIN_IDS_MAP.CHZ]: [
+    {
+      currencySymbol: CHAINLIST_CURRENCY_SYMBOLS_MAP_NETWORK_COLLISION.CHZ,
+    },
+  ],
+  [CHAINLIST_CHAIN_IDS_MAP.WETHIO]: [
+    {
+      currencySymbol: CHAINLIST_CURRENCY_SYMBOLS_MAP_NETWORK_COLLISION.WETHIO,
+    },
+  ],
+};
+
 export const CHAIN_ID_TO_TYPE_MAP = {
   [CHAIN_IDS.MAINNET]: NETWORK_TYPES.MAINNET,
   [CHAIN_IDS.GOERLI]: NETWORK_TYPES.GOERLI,
@@ -726,6 +759,8 @@ export const CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP = {
   [CHAINLIST_CHAIN_IDS_MAP.VELAS_EVM_MAINNET]: VELAS_EVM_MAINNET_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.ZKATANA]: ZKATANA_MAINNET_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.ZORA_MAINNET]: ZORA_MAINNET_IMAGE_URL,
+  [CHAINLIST_CHAIN_IDS_MAP.FILECOIN]: FILECOIN_MAINNET_IMAGE_URL,
+  [CHAINLIST_CHAIN_IDS_MAP.BASE]: BASE_TOKEN_IMAGE_URL,
 } as const;
 
 export const CHAIN_ID_TO_ETHERS_NETWORK_NAME_MAP = {
@@ -747,6 +782,9 @@ export const CHAIN_ID_TOKEN_IMAGE_MAP = {
   [CHAIN_IDS.CELO]: CELO_TOKEN_IMAGE_URL,
   [CHAIN_IDS.GNOSIS]: GNOSIS_TOKEN_IMAGE_URL,
   [CHAIN_IDS.FANTOM]: FTM_TOKEN_IMAGE_URL,
+  [CHAIN_IDS.FILECOIN]: FILECOIN_MAINNET_IMAGE_URL,
+  [CHAIN_IDS.SCROLL]: SCROLL_IMAGE_URL,
+  [CHAIN_IDS.SCROLL_SEPOLIA]: SCROLL_IMAGE_URL,
 } as const;
 
 export const INFURA_BLOCKED_KEY = 'countryBlocked';
@@ -887,6 +925,12 @@ export const BUYABLE_CHAINS_MAP: {
     | typeof CHAIN_IDS.AURORA
     | typeof CHAIN_IDS.ARBITRUM_GOERLI
     | typeof CHAIN_IDS.BLAST
+    | typeof CHAIN_IDS.FILECOIN
+    | typeof CHAIN_IDS.POLYGON_ZKEVM
+    | typeof CHAIN_IDS.SCROLL
+    | typeof CHAIN_IDS.SCROLL_SEPOLIA
+    | typeof CHAIN_IDS.WETHIO
+    | typeof CHAIN_IDS.CHZ
   >]: BuyableChainSettings;
 } = {
   [CHAIN_IDS.MAINNET]: {
@@ -1006,26 +1050,6 @@ export const FEATURED_RPCS: RPCDefinition[] = [
       imageUrl: MATIC_TOKEN_IMAGE_URL,
     },
   },
-  {
-    chainId: CHAIN_IDS.CELO,
-    nickname: CELO_DISPLAY_NAME,
-    rpcUrl: `https://celo-mainnet.infura.io/v3/${infuraProjectId}`,
-    ticker: CURRENCY_SYMBOLS.CELO,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://celoscan.io',
-      imageUrl: CELO_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: CHAIN_IDS.GNOSIS,
-    nickname: GNOSIS_DISPLAY_NAME,
-    rpcUrl: `https://rpc.gnosischain.com`,
-    ticker: CURRENCY_SYMBOLS.GNOSIS,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://gnosisscan.io',
-      imageUrl: GNOSIS_TOKEN_IMAGE_URL,
-    },
-  },
   {
     chainId: CHAIN_IDS.ZKSYNC_ERA,
     nickname: ZK_SYNC_ERA_DISPLAY_NAME,
diff --git a/shared/constants/notifications.ts b/shared/constants/notifications.ts
new file mode 100644
index 000000000000..54254570d1b2
--- /dev/null
+++ b/shared/constants/notifications.ts
@@ -0,0 +1,2 @@
+export const NOTIFICATION_HEIGHT = 620;
+export const NOTIFICATION_WIDTH = 360;
diff --git a/shared/constants/onboarding.ts b/shared/constants/onboarding.ts
index 615d47833e44..7dec861ad63f 100644
--- a/shared/constants/onboarding.ts
+++ b/shared/constants/onboarding.ts
@@ -1,4 +1,19 @@
 export enum FirstTimeFlowType {
+  /**
+   * When a user imports a wallet from a seed phrase they will have the
+   * 'import' firstTimeFlowType.
+   */
   import = 'import',
+  /**
+   * When a user creates a new wallet during onboarding they will have the
+   * 'create' firstTimeFlowType.
+   */
   create = 'create',
+  /**
+   * A special case for when a user's MetaMask encounters an error during the
+   * loading of state. They will be presented with an option to restore their
+   * MetaMask if their vault was backed up. This will set their
+   * firstTimeFlowType to 'restore'.
+   */
+  restore = 'restore',
 }
diff --git a/shared/constants/permissions.test.js b/shared/constants/permissions.test.js
index 38dc1e1c87a4..b63014359bb7 100644
--- a/shared/constants/permissions.test.js
+++ b/shared/constants/permissions.test.js
@@ -15,7 +15,6 @@ describe('EndowmentPermissions', () => {
     expect(Object.keys(EndowmentPermissions).sort()).toStrictEqual(
       [
         'endowment:name-lookup',
-        'endowment:signature-insight',
         ...Object.keys(endowmentPermissionBuilders).filter(
           (targetName) =>
             !Object.keys(ExcludedSnapEndowments).includes(targetName),
diff --git a/shared/constants/smartTransactions.js b/shared/constants/smartTransactions.js
deleted file mode 100644
index a77d993c7085..000000000000
--- a/shared/constants/smartTransactions.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SECOND } from './time';
-
-export const FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME = SECOND * 10;
-export const FALLBACK_SMART_TRANSACTIONS_DEADLINE = 180;
-export const FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER = 2;
diff --git a/shared/constants/smartTransactions.test.ts b/shared/constants/smartTransactions.test.ts
new file mode 100644
index 000000000000..47f4f8250c2b
--- /dev/null
+++ b/shared/constants/smartTransactions.test.ts
@@ -0,0 +1,33 @@
+import { isProduction } from '../modules/environment';
+import { getAllowedSmartTransactionsChainIds } from './smartTransactions';
+import { CHAIN_IDS } from './network';
+
+jest.mock('../modules/environment', () => ({
+  isProduction: jest.fn(() => false), // Initially mock isProduction to return false
+}));
+
+// Cast isProduction to jest.Mock to inform TypeScript about the mock type
+const mockIsProduction = isProduction as jest.Mock;
+
+describe('smartTransactions', () => {
+  describe('getAllowedSmartTransactionsChainIds', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should return the correct chain IDs for development environment', () => {
+      mockIsProduction.mockReturnValue(false);
+      const allowedChainIds = getAllowedSmartTransactionsChainIds();
+      expect(allowedChainIds).toStrictEqual([
+        CHAIN_IDS.MAINNET,
+        CHAIN_IDS.SEPOLIA,
+      ]);
+    });
+
+    it('should return the correct chain IDs for production environment', () => {
+      mockIsProduction.mockReturnValue(true);
+      const allowedChainIds = getAllowedSmartTransactionsChainIds();
+      expect(allowedChainIds).toStrictEqual([CHAIN_IDS.MAINNET]);
+    });
+  });
+});
diff --git a/shared/constants/smartTransactions.ts b/shared/constants/smartTransactions.ts
new file mode 100644
index 000000000000..4e39ec5ba234
--- /dev/null
+++ b/shared/constants/smartTransactions.ts
@@ -0,0 +1,31 @@
+import { isProduction } from '../modules/environment';
+import { SECOND } from './time';
+import { CHAIN_IDS } from './network';
+
+export const FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME: number = SECOND * 10;
+export const FALLBACK_SMART_TRANSACTIONS_DEADLINE: number = 180;
+export const FALLBACK_SMART_TRANSACTIONS_EXPECTED_DEADLINE = 45;
+export const FALLBACK_SMART_TRANSACTIONS_MAX_DEADLINE = 150;
+export const FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER: number = 2;
+
+const ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS_DEVELOPMENT: string[] = [
+  CHAIN_IDS.MAINNET,
+  CHAIN_IDS.SEPOLIA,
+];
+
+const ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS_PRODUCTION: string[] = [
+  CHAIN_IDS.MAINNET,
+];
+
+export const getAllowedSmartTransactionsChainIds = (): string[] => {
+  return isProduction()
+    ? ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS_PRODUCTION
+    : ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS_DEVELOPMENT;
+};
+
+export const SKIP_STX_RPC_URL_CHECK_CHAIN_IDS: string[] = [CHAIN_IDS.SEPOLIA];
+
+export const CANCEL_GAS_LIMIT_DEC = 21000;
+
+export const SMART_TRANSACTIONS_LEARN_MORE_URL =
+  'https://support.metamask.io/transactions-and-gas/transactions/smart-transactions/';
diff --git a/shared/constants/snaps/permissions.ts b/shared/constants/snaps/permissions.ts
index f0c798e05e0b..aca6f5ef8023 100644
--- a/shared/constants/snaps/permissions.ts
+++ b/shared/constants/snaps/permissions.ts
@@ -7,8 +7,8 @@ export const EndowmentPermissions = Object.freeze({
   'endowment:webassembly': 'endowment:webassembly',
   'endowment:lifecycle-hooks': 'endowment:lifecycle-hooks',
   'endowment:page-home': 'endowment:page-home',
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   'endowment:signature-insight': 'endowment:signature-insight',
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   'endowment:name-lookup': 'endowment:name-lookup',
   ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
@@ -26,8 +26,6 @@ export const ExcludedSnapEndowments = Object.freeze({
   ///: BEGIN:ONLY_INCLUDE_IF(build-main)
   'endowment:name-lookup':
     'This endowment is experimental and therefore not available.',
-  'endowment:signature-insight':
-    'This endowment is experimental and therefore not available.',
   ///: END:ONLY_INCLUDE_IF
 });
 
diff --git a/shared/constants/swaps.ts b/shared/constants/swaps.ts
index b861c571c181..04e3b0a31cd6 100644
--- a/shared/constants/swaps.ts
+++ b/shared/constants/swaps.ts
@@ -49,6 +49,10 @@ export type SwapsTokenObject = {
   iconUrl: string;
 };
 
+type BlockExplorerUrlMap = {
+  [key: string]: string;
+};
+
 export const ETH_SWAPS_TOKEN_OBJECT: SwapsTokenObject = {
   symbol: CURRENCY_SYMBOLS.ETH,
   name: 'Ether',
@@ -166,7 +170,7 @@ const SWAPS_TESTNET_CHAIN_ID = '0x539';
 
 export const SWAPS_API_V2_BASE_URL = 'https://swap.metaswap.codefi.network';
 export const SWAPS_DEV_API_V2_BASE_URL = 'https://swap.dev-api.cx.metamask.io';
-export const GAS_API_BASE_URL = 'https://gas.api.cx.metamask.io';
+export const GAS_API_BASE_URL = 'https://gas.api.infura.io';
 export const GAS_DEV_API_BASE_URL = 'https://gas.uat-api.cx.metamask.io';
 
 const BSC_DEFAULT_BLOCK_EXPLORER_URL = 'https://bscscan.com/';
@@ -180,9 +184,6 @@ const ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL = 'https://explorer.zksync.io/';
 const LINEA_DEFAULT_BLOCK_EXPLORER_URL = 'https://lineascan.build/';
 const BASE_DEFAULT_BLOCK_EXPLORER_URL = 'https://basescan.org/';
 
-export const SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL =
-  'https://support.metamask.io/hc/articles/9184393821211';
-
 export const ALLOWED_PROD_SWAPS_CHAIN_IDS = [
   CHAIN_IDS.MAINNET,
   SWAPS_TESTNET_CHAIN_ID,
@@ -296,18 +297,19 @@ export const SWAPS_CHAINID_DEFAULT_TOKEN_MAP = {
   [CHAIN_IDS.BASE]: BASE_SWAPS_TOKEN_OBJECT,
 } as const;
 
-export const SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP = {
-  [CHAIN_IDS.BSC]: BSC_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.MAINNET]: MAINNET_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.POLYGON]: POLYGON_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.GOERLI]: GOERLI_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.AVALANCHE]: AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.OPTIMISM]: OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.ARBITRUM]: ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.ZKSYNC_ERA]: ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.LINEA_MAINNET]: LINEA_DEFAULT_BLOCK_EXPLORER_URL,
-  [CHAIN_IDS.BASE]: BASE_DEFAULT_BLOCK_EXPLORER_URL,
-} as const;
+export const SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP: BlockExplorerUrlMap =
+  {
+    [CHAIN_IDS.BSC]: BSC_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.MAINNET]: MAINNET_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.POLYGON]: POLYGON_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.GOERLI]: GOERLI_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.AVALANCHE]: AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.OPTIMISM]: OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.ARBITRUM]: ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.ZKSYNC_ERA]: ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.LINEA_MAINNET]: LINEA_DEFAULT_BLOCK_EXPLORER_URL,
+    [CHAIN_IDS.BASE]: BASE_DEFAULT_BLOCK_EXPLORER_URL,
+  } as const;
 
 export const ETHEREUM = 'ethereum';
 export const POLYGON = 'polygon';
diff --git a/shared/constants/urls.ts b/shared/constants/urls.ts
new file mode 100644
index 000000000000..a44d7d2573c8
--- /dev/null
+++ b/shared/constants/urls.ts
@@ -0,0 +1,3 @@
+export enum BaseUrl {
+  Portfolio = 'https://portfolio.metamask.io',
+}
diff --git a/shared/lib/fetch-with-cache.ts b/shared/lib/fetch-with-cache.ts
index 8a84ad76f8c4..598dd566b7d9 100644
--- a/shared/lib/fetch-with-cache.ts
+++ b/shared/lib/fetch-with-cache.ts
@@ -9,7 +9,11 @@ const fetchWithCache = async ({
   functionName = '',
 }: {
   url: string;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   fetchOptions?: Record<string, any>;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   cacheOptions?: Record<string, any>;
   functionName: string;
 }) => {
diff --git a/shared/lib/swaps-utils.js b/shared/lib/swaps-utils.js
index 5b5107b4495d..67223bfddf80 100644
--- a/shared/lib/swaps-utils.js
+++ b/shared/lib/swaps-utils.js
@@ -3,7 +3,6 @@ import log from 'loglevel';
 import { CHAIN_IDS } from '../constants/network';
 import {
   GAS_API_BASE_URL,
-  GAS_DEV_API_BASE_URL,
   SWAPS_API_V2_BASE_URL,
   SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
   SWAPS_CLIENT_ID,
@@ -130,7 +129,7 @@ const getBaseUrlForNewSwapsApi = (type, chainId) => {
   const v2ApiBaseUrl = useDevApis
     ? SWAPS_DEV_API_V2_BASE_URL
     : SWAPS_API_V2_BASE_URL;
-  const gasApiBaseUrl = useDevApis ? GAS_DEV_API_BASE_URL : GAS_API_BASE_URL;
+  const gasApiBaseUrl = GAS_API_BASE_URL;
   const noNetworkSpecificTypes = ['refreshTime']; // These types don't need network info in the URL.
   if (noNetworkSpecificTypes.includes(type)) {
     return v2ApiBaseUrl;
diff --git a/shared/lib/token-util.ts b/shared/lib/token-util.ts
index 4f8e6b15b9df..18591b550ec7 100644
--- a/shared/lib/token-util.ts
+++ b/shared/lib/token-util.ts
@@ -17,6 +17,8 @@ import { Web3Provider } from '@ethersproject/providers';
  * @param tokenData - ethers Interface token data.
  * @returns A decimal string value.
  */
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getTokenIdParam(tokenData: any = {}): string | undefined {
   return (
     tokenData?.args?._tokenId?.toString() ?? tokenData?.args?.id?.toString()
@@ -26,7 +28,11 @@ export function getTokenIdParam(tokenData: any = {}): string | undefined {
 export async function fetchTokenBalance(
   address: string,
   userAddress: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   provider: any,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): Promise<any> {
   const ethersProvider = new Web3Provider(provider);
   const tokenContract = new Contract(address, abiERC20, ethersProvider);
@@ -40,7 +46,11 @@ export async function fetchERC1155Balance(
   address: string,
   userAddress: string,
   tokenId: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   provider: any,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): Promise<any> {
   if (!userAddress || !tokenId) {
     return null;
diff --git a/shared/modules/Numeric.ts b/shared/modules/Numeric.ts
index 9c5437f4b4b5..d7a87a0050d4 100644
--- a/shared/modules/Numeric.ts
+++ b/shared/modules/Numeric.ts
@@ -11,7 +11,7 @@ export type NumericValue = string | number | BN | BigNumber;
 export type NumericBase = 10 | 16;
 
 /**
- * All variations of isHexString from our own utilities and etherumjs-utils
+ * All variations of isHexString from our own utilities and ethereumjs-utils
  * return false for a '-' prefixed hex string. This utility method strips the
  * possible '-' from the string before testing its validity so that negative
  * hex values can be properly handled.
@@ -25,7 +25,7 @@ function isHexStringOrNegatedHexString(value: string): value is string {
 
 /**
  * BigNumber supports hex strings with '.' (aka decimals) in the string.
- * No version of isHexString returs true if the string contains a decimal so
+ * No version of isHexString returns true if the string contains a decimal so
  * this method is used to check if both parts of the string split by the
  * decimal are hex strings. If so we can feed this value into BigNumber to get
  * a valid Numeric.
@@ -83,7 +83,7 @@ function decimalToBigNumber(value: string | number) {
  * string value must be provided.
  *
  * @param value - A hexadecimal or decimal string
- * @param numericBase - Either 16 for a hexadeciaml or 10 for a decimal
+ * @param numericBase - Either 16 for a hexadecimal or 10 for a decimal
  * @returns A BigNumber representation of the value
  */
 function stringToBigNumber(value: string, numericBase: NumericBase) {
@@ -110,7 +110,7 @@ function stringToBigNumber(value: string, numericBase: NumericBase) {
 }
 
 /**
- * This method will convert a hexadecimal or deciaml number into a BigNumber.
+ * This method will convert a hexadecimal or decimal number into a BigNumber.
  * The second parameter must be supplied and determines whether to treat the
  * value as a hexadecimal or decimal value.
  *
@@ -241,7 +241,7 @@ function alignOperandDenominations(
  * decimal of GWEI. Prior to this class the method would call into our root
  * level 'conversionUtil' which was the proverbial kitchen sink doing
  * everything from denomination conversion, currency conversion (with provided
- * conversionRate prop) and more. The same opeartion can now be expressed as:
+ * conversionRate prop) and more. The same operation can now be expressed as:
  * new Numeric(hexString, 16, EtherDenomination.WEI)
  * .toDenomination(EtherDenomination.GWEI)
  * .toBase(10)
@@ -348,9 +348,9 @@ export class Numeric {
    * the predecessor to Numeric, 'conversionUtil', were programmed into this
    * method:
    * 1. You may supply a denomination that is undefined, which will result in
-   * nothing happening. Coincidently this is also useful due to the nature of
+   * nothing happening. Coincidentally this is also useful due to the nature of
    * chaining operations on Numeric. You may pass an undefined value in this
-   * method without breaking the chain to conditionally apply a operator.
+   * method without breaking the chain to conditionally apply an operator.
    * 2. If the numeric that .toDenomination is called on does not have a
    * denomination set, that is it was constructed without the third parameter,
    * then it is assumed to be in ETH. Otherwise we convert it to ETH prior to
@@ -624,7 +624,7 @@ export class Numeric {
    * Returns a fixed-point decimal string representation of the Numeric
    *
    * @param decimals - the amount of decimal precision to use when rounding
-   * @returns A fixed point decimal string represenation of the Numeric
+   * @returns A fixed point decimal string representation of the Numeric
    */
   toFixed(decimals: number) {
     return this.value.toFixed(decimals);
diff --git a/shared/modules/browser-runtime.utils.js b/shared/modules/browser-runtime.utils.js
index 8f7b2afe71e8..c082ef9b8c78 100644
--- a/shared/modules/browser-runtime.utils.js
+++ b/shared/modules/browser-runtime.utils.js
@@ -2,8 +2,13 @@
  * Utility Functions to support browser.runtime JavaScript API
  */
 
+import Bowser from 'bowser';
 import browser from 'webextension-polyfill';
 import log from 'loglevel';
+import {
+  BROKEN_PRERENDER_BROWSER_VERSIONS,
+  FIXED_PRERENDER_BROWSER_VERSIONS,
+} from '../../ui/helpers/constants/common';
 
 /**
  * Returns an Error if extension.runtime.lastError is present
@@ -53,3 +58,21 @@ export function checkForLastErrorAndWarn() {
 
   return error;
 }
+
+/**
+ * Returns true if the browser is affected by a regression that causes the
+ * extension port stream established between the contentscript and background
+ * to be broken when a prerendered (eagerly rendered, hidden) page becomes active (visible to the user).
+ *
+ * @param {Bowser} bowser - optional Bowser instance to check against
+ * @returns {boolean} Whether the browser is affected by the prerender regression
+ */
+export function getIsBrowserPrerenderBroken(
+  bowser = Bowser.getParser(window.navigator.userAgent),
+) {
+  return (
+    (bowser.satisfies(BROKEN_PRERENDER_BROWSER_VERSIONS) &&
+      !bowser.satisfies(FIXED_PRERENDER_BROWSER_VERSIONS)) ??
+    false
+  );
+}
diff --git a/shared/modules/browser-runtime.utils.test.js b/shared/modules/browser-runtime.utils.test.js
index b116f2d7caf3..e580112fe29d 100644
--- a/shared/modules/browser-runtime.utils.test.js
+++ b/shared/modules/browser-runtime.utils.test.js
@@ -1,4 +1,5 @@
 import sinon from 'sinon';
+import Bowser from 'bowser';
 import browser from 'webextension-polyfill';
 import log from 'loglevel';
 import * as BrowserRuntimeUtil from './browser-runtime.utils';
@@ -51,4 +52,101 @@ describe('Browser Runtime Utils', () => {
       log.error.restore();
     });
   });
+
+  describe('getIsBrowserPrerenderBroken', () => {
+    it('should call Bowser.getParser when no parameter is passed', () => {
+      const spy = jest.spyOn(Bowser, 'getParser');
+      BrowserRuntimeUtil.getIsBrowserPrerenderBroken();
+      expect(spy).toHaveBeenCalled();
+    });
+    it.each([
+      ['windows', '112.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['windows', '120.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['macos', '112.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['macos', '120.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['linux', '112.0.0.0', 'X11; Linux x86_64'],
+      ['linux', '121.0.0.0', 'X11; Linux x86_64'],
+    ])(
+      'should return false when given a chrome browser with working prerender in %s on version %s',
+      (_, version, os) => {
+        const bowser = Bowser.getParser(
+          `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${version} Safari/537.36`,
+        );
+        const result = BrowserRuntimeUtil.getIsBrowserPrerenderBroken(bowser);
+        expect(result).toStrictEqual(false);
+      },
+    );
+    it.each([
+      ['windows', '113.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['windows', '119.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['macos', '113.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['macos', '119.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['linux', '113.0.0.0', 'X11; Linux x86_64'],
+      ['linux', '120.0.0.0', 'X11; Linux x86_64'],
+    ])(
+      'should return true when given a chrome browser with broken prerender in %s on version %s',
+      (_, version, os) => {
+        const bowser = Bowser.getParser(
+          `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${version} Safari/537.36`,
+        );
+        const result = BrowserRuntimeUtil.getIsBrowserPrerenderBroken(bowser);
+        expect(result).toStrictEqual(true);
+      },
+    );
+    it.each([
+      ['windows', '112.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['windows', '120.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['macos', '112.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['macos', '120.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['linux', '112.0.0.0', 'X11; Linux x86_64'],
+      ['linux', '121.0.0.0', 'X11; Linux x86_64'],
+    ])(
+      'should return false when given an edge browser with working prerender in %s on version %s',
+      (_, version, os) => {
+        const bowser = Bowser.getParser(
+          `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/i${version} Safari/537.36 Edg/${version}`,
+        );
+        const result = BrowserRuntimeUtil.getIsBrowserPrerenderBroken(bowser);
+        expect(result).toStrictEqual(false);
+      },
+    );
+    it.each([
+      ['windows', '113.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['windows', '119.0.0.0', 'Windows NT 10.0; Win64; x64'],
+      ['macos', '113.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['macos', '119.0.0.0', 'Macintosh; Intel Mac OS X 10_16_0'],
+      ['linux', '113.0.0.0', 'X11; Linux x86_64'],
+      ['linux', '120.0.0.0', 'X11; Linux x86_64'],
+    ])(
+      'should return true when given an edge browser with broken prerender in %s on version %s',
+      (_, version, os) => {
+        const bowser = Bowser.getParser(
+          `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/i${version} Safari/537.36 Edg/${version}`,
+        );
+        const result = BrowserRuntimeUtil.getIsBrowserPrerenderBroken(bowser);
+        expect(result).toStrictEqual(true);
+      },
+    );
+    it('should return false when given a firefox browser', () => {
+      const bowser = Bowser.getParser(
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/91.0',
+      );
+      const result = BrowserRuntimeUtil.getIsBrowserPrerenderBroken(bowser);
+      expect(result).toStrictEqual(false);
+    });
+    it('should return false when given an opera browser', () => {
+      const bowser = Bowser.getParser(
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.3578.98 Safari/537.36 OPR/76.0.3135.47',
+      );
+      const result = BrowserRuntimeUtil.getIsBrowserPrerenderBroken(bowser);
+      expect(result).toStrictEqual(false);
+    });
+    it('should return false when given an unknown browser', () => {
+      const bowser = Bowser.getParser(
+        'Mozilla/5.0 (Nintendo Switch; WebApplet) AppleWebKit/609.4 (KHTML, like Gecko) NF/6.0.2.21.3 NintendoBrowser/5.1.0.22474',
+      );
+      const result = BrowserRuntimeUtil.getIsBrowserPrerenderBroken(bowser);
+      expect(result).toStrictEqual(false);
+    });
+  });
 });
diff --git a/shared/modules/environment.test.ts b/shared/modules/environment.test.ts
new file mode 100644
index 000000000000..a6d8128cc764
--- /dev/null
+++ b/shared/modules/environment.test.ts
@@ -0,0 +1,29 @@
+import { ENVIRONMENT } from '../../development/build/constants';
+import { isProduction } from './environment';
+
+describe('isProduction', () => {
+  let originalMetaMaskEnvironment: string | undefined;
+
+  beforeAll(() => {
+    originalMetaMaskEnvironment = process.env.METAMASK_ENVIRONMENT;
+  });
+
+  afterAll(() => {
+    process.env.METAMASK_ENVIRONMENT = originalMetaMaskEnvironment;
+  });
+
+  it('should return true when ENVIRONMENT is "production"', () => {
+    process.env.METAMASK_ENVIRONMENT = ENVIRONMENT.PRODUCTION;
+    expect(isProduction()).toBe(true);
+  });
+
+  it('should return false when ENVIRONMENT is "development"', () => {
+    process.env.METAMASK_ENVIRONMENT = ENVIRONMENT.DEVELOPMENT;
+    expect(isProduction()).toBe(false);
+  });
+
+  it('should return false when ENVIRONMENT is "testing"', () => {
+    process.env.METAMASK_ENVIRONMENT = ENVIRONMENT.TESTING;
+    expect(isProduction()).toBe(false);
+  });
+});
diff --git a/shared/modules/environment.ts b/shared/modules/environment.ts
new file mode 100644
index 000000000000..96631bdc6f9b
--- /dev/null
+++ b/shared/modules/environment.ts
@@ -0,0 +1,8 @@
+import { ENVIRONMENT } from '../../development/build/constants';
+
+export const isProduction = (): boolean => {
+  return (
+    process.env.METAMASK_ENVIRONMENT !== ENVIRONMENT.DEVELOPMENT &&
+    process.env.METAMASK_ENVIRONMENT !== ENVIRONMENT.TESTING
+  );
+};
diff --git a/shared/modules/feature-flags.ts b/shared/modules/feature-flags.ts
new file mode 100644
index 000000000000..4c05c1919922
--- /dev/null
+++ b/shared/modules/feature-flags.ts
@@ -0,0 +1,41 @@
+import { CHAIN_IDS } from '../constants/network';
+
+enum NetworkName {
+  Ethereum = 'ethereum',
+  Polygon = 'polygon',
+  Bsc = 'bsc',
+  Avalanche = 'avalanche',
+  Optimism = 'optimism',
+  Arbitrum = 'arbitrum',
+  ZkSyncEra = 'zksync',
+  Linea = 'linea',
+}
+
+/**
+ * @param chainId
+ * @returns string e.g. ethereum, bsc or polygon
+ */
+export const getNetworkNameByChainId = (chainId: string): string => {
+  switch (chainId) {
+    case CHAIN_IDS.MAINNET:
+    case CHAIN_IDS.GOERLI:
+    case CHAIN_IDS.SEPOLIA:
+      return NetworkName.Ethereum;
+    case CHAIN_IDS.BSC:
+      return NetworkName.Bsc;
+    case CHAIN_IDS.POLYGON:
+      return NetworkName.Polygon;
+    case CHAIN_IDS.AVALANCHE:
+      return NetworkName.Avalanche;
+    case CHAIN_IDS.OPTIMISM:
+      return NetworkName.Optimism;
+    case CHAIN_IDS.ARBITRUM:
+      return NetworkName.Arbitrum;
+    case CHAIN_IDS.ZKSYNC_ERA:
+      return NetworkName.ZkSyncEra;
+    case CHAIN_IDS.LINEA_MAINNET:
+      return NetworkName.Linea;
+    default:
+      return '';
+  }
+};
diff --git a/shared/modules/i18n.test.ts b/shared/modules/i18n.test.ts
index 3353e4732e64..7a52137b7dc8 100644
--- a/shared/modules/i18n.test.ts
+++ b/shared/modules/i18n.test.ts
@@ -307,6 +307,8 @@ describe('I18N Module', () => {
         RelativeTimeFormat: {
           __addLocaleData: addMock,
         },
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any;
 
       await loadRelativeTimeFormatLocaleData(`${localeCodeMock}_test`);
@@ -324,6 +326,8 @@ describe('I18N Module', () => {
         RelativeTimeFormat: {
           __addLocaleData: addMock,
         },
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any;
 
       await loadRelativeTimeFormatLocaleData(`${localeCodeMock}_test`);
diff --git a/shared/modules/i18n.ts b/shared/modules/i18n.ts
index 84c433c58d8e..790d9da25313 100644
--- a/shared/modules/i18n.ts
+++ b/shared/modules/i18n.ts
@@ -20,6 +20,8 @@ export type I18NMessageDict = {
   [translationKey: string]: I18NMessage;
 };
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type I18NSubstitution = string | (() => any) | object;
 
 // A parameterized type (or generic type) of maps that use the same structure (translationKey) key
@@ -104,10 +106,14 @@ export async function loadRelativeTimeFormatLocaleData(
   const languageTag = localeCode.split('_')[0];
   if (
     Intl.RelativeTimeFormat &&
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     typeof (Intl.RelativeTimeFormat as any).__addLocaleData === 'function' &&
     !relativeTimeFormatLocaleData.has(languageTag)
   ) {
     const localeData = await fetchRelativeTimeFormatData(languageTag);
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (Intl.RelativeTimeFormat as any).__addLocaleData(localeData);
     relativeTimeFormatLocaleData.add(languageTag);
   }
diff --git a/shared/modules/metametrics.test.ts b/shared/modules/metametrics.test.ts
new file mode 100644
index 000000000000..1227be64db6f
--- /dev/null
+++ b/shared/modules/metametrics.test.ts
@@ -0,0 +1,151 @@
+import { Provider } from '@metamask/network-controller';
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import { createTestProviderTools } from '../../test/stub/provider';
+import { TransactionMetricsRequest } from '../../app/scripts/lib/transaction/metrics';
+import { CHAIN_IDS } from '../constants/network';
+import { getSmartTransactionMetricsProperties } from './metametrics';
+
+const txHash =
+  '0x0302b75dfb9fd9eb34056af031efcaee2a8cbd799ea054a85966165cd82a7356';
+const address = '0x1678a085c290ebd122dc42cba69373b5953b831d';
+const providerResultStub = {
+  eth_getCode: '0x123',
+};
+const { provider } = createTestProviderTools({
+  scaffold: providerResultStub,
+  chainId: CHAIN_IDS.MAINNET,
+});
+
+const createTransactionMetricsRequest = (customProps = {}) => {
+  return {
+    createEventFragment: jest.fn(),
+    finalizeEventFragment: jest.fn(),
+    getEventFragmentById: jest.fn(),
+    updateEventFragment: jest.fn(),
+    getAccountType: jest.fn(),
+    getDeviceModel: jest.fn(),
+    getEIP1559GasFeeEstimates: jest.fn(),
+    getSelectedAddress: jest.fn(),
+    getParticipateInMetrics: jest.fn(),
+    getTokenStandardAndDetails: jest.fn(),
+    getTransaction: jest.fn(),
+    provider: provider as Provider,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    snapAndHardwareMessenger: jest.fn() as any,
+    trackEvent: jest.fn(),
+    getIsSmartTransaction: jest.fn(),
+    getSmartTransactionByMinedTxHash: jest.fn(),
+    ...customProps,
+  } as TransactionMetricsRequest;
+};
+
+const createTransactionMeta = () => {
+  return {
+    id: '1',
+    status: TransactionStatus.unapproved,
+    txParams: {
+      from: address,
+      to: address,
+      gasPrice: '0x77359400',
+      gas: '0x7b0d',
+      nonce: '0x4b',
+    },
+    type: TransactionType.simpleSend,
+    chainId: CHAIN_IDS.MAINNET,
+    time: 1624408066355,
+    defaultGasEstimates: {
+      gas: '0x7b0d',
+      gasPrice: '0x77359400',
+    },
+    securityProviderResponse: {
+      flagAsDangerous: 0,
+    },
+    hash: txHash,
+    error: null,
+  };
+};
+
+describe('getSmartTransactionMetricsProperties', () => {
+  it('returns all smart transaction properties', () => {
+    const transactionMetricsRequest = createTransactionMetricsRequest({
+      getIsSmartTransaction: () => true,
+      getSmartTransactionByMinedTxHash: () => {
+        return {
+          uuid: 'uuid',
+          status: 'success',
+          cancellable: false,
+          statusMetadata: {
+            cancellationFeeWei: 36777567771000,
+            cancellationReason: 'not_cancelled',
+            deadlineRatio: 0.6400288486480713,
+            minedHash: txHash,
+            duplicated: true,
+            timedOut: true,
+            proxied: true,
+            minedTx: 'success',
+          },
+        };
+      },
+    });
+    const transactionMeta = createTransactionMeta();
+
+    const result = getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      transactionMeta as any,
+    );
+
+    expect(result).toStrictEqual({
+      is_smart_transaction: true,
+      smart_transaction_duplicated: true,
+      smart_transaction_proxied: true,
+      smart_transaction_timed_out: true,
+    });
+  });
+
+  it('returns "is_smart_transaction: false" if it is not a smart transaction', () => {
+    const transactionMetricsRequest = createTransactionMetricsRequest({
+      getIsSmartTransaction: () => false,
+    });
+    const transactionMeta = createTransactionMeta();
+
+    const result = getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      transactionMeta as any,
+    );
+
+    expect(result).toStrictEqual({
+      is_smart_transaction: false,
+    });
+  });
+
+  it('returns "is_smart_transaction: true" only if it is a smart transaction, but does not have statusMetadata', () => {
+    const transactionMetricsRequest = createTransactionMetricsRequest({
+      getIsSmartTransaction: () => true,
+      getSmartTransactionByMinedTxHash: () => {
+        return {
+          statusMetadata: null,
+        };
+      },
+    });
+    const transactionMeta = createTransactionMeta();
+
+    const result = getSmartTransactionMetricsProperties(
+      transactionMetricsRequest,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      transactionMeta as any,
+    );
+
+    expect(result).toStrictEqual({
+      is_smart_transaction: true,
+    });
+  });
+});
diff --git a/shared/modules/metametrics.ts b/shared/modules/metametrics.ts
new file mode 100644
index 000000000000..af049231bdf5
--- /dev/null
+++ b/shared/modules/metametrics.ts
@@ -0,0 +1,36 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { TransactionMetricsRequest } from '../../app/scripts/lib/transaction/metrics';
+
+type SmartTransactionMetricsProperties = {
+  is_smart_transaction: boolean;
+  smart_transaction_duplicated?: boolean;
+  smart_transaction_timed_out?: boolean;
+  smart_transaction_proxied?: boolean;
+};
+
+export const getSmartTransactionMetricsProperties = (
+  transactionMetricsRequest: TransactionMetricsRequest,
+  transactionMeta: TransactionMeta,
+) => {
+  const isSmartTransaction = transactionMetricsRequest.getIsSmartTransaction();
+  const properties = {
+    is_smart_transaction: isSmartTransaction,
+  } as SmartTransactionMetricsProperties;
+  if (!isSmartTransaction) {
+    return properties;
+  }
+  const smartTransaction =
+    transactionMetricsRequest.getSmartTransactionByMinedTxHash(
+      transactionMeta.hash,
+    );
+  const smartTransactionStatusMetadata = smartTransaction?.statusMetadata;
+  if (!smartTransactionStatusMetadata) {
+    return properties;
+  }
+  properties.smart_transaction_duplicated =
+    smartTransactionStatusMetadata.duplicated;
+  properties.smart_transaction_timed_out =
+    smartTransactionStatusMetadata.timedOut;
+  properties.smart_transaction_proxied = smartTransactionStatusMetadata.proxied;
+  return properties;
+};
diff --git a/shared/modules/network.utils.ts b/shared/modules/network.utils.ts
index e1d7279fd578..8985bdcf7f5a 100644
--- a/shared/modules/network.utils.ts
+++ b/shared/modules/network.utils.ts
@@ -48,6 +48,13 @@ export function isTokenDetectionEnabledForNetwork(chainId: string | undefined) {
     case CHAIN_IDS.OPTIMISM:
     case CHAIN_IDS.BASE:
     case CHAIN_IDS.ZKSYNC_ERA:
+    case CHAIN_IDS.CRONOS:
+    case CHAIN_IDS.CELO:
+    case CHAIN_IDS.GNOSIS:
+    case CHAIN_IDS.FANTOM:
+    case CHAIN_IDS.POLYGON_ZKEVM:
+    case CHAIN_IDS.MOONBEAM:
+    case CHAIN_IDS.MOONRIVER:
       return true;
     default:
       return false;
diff --git a/shared/modules/selectors/feature-flags.ts b/shared/modules/selectors/feature-flags.ts
new file mode 100644
index 000000000000..930f478aa962
--- /dev/null
+++ b/shared/modules/selectors/feature-flags.ts
@@ -0,0 +1,35 @@
+import { getCurrentChainId } from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file.
+import { getNetworkNameByChainId } from '../feature-flags';
+
+type FeatureFlagsMetaMaskState = {
+  metamask: {
+    swapsState: {
+      swapsFeatureFlags: {
+        [key: string]: {
+          extensionActive: boolean;
+          mobileActive: boolean;
+          smartTransactions: {
+            expectedDeadline?: number;
+            maxDeadline?: number;
+            returnTxHashAsap?: boolean;
+          };
+        };
+      };
+    };
+  };
+};
+
+export function getFeatureFlagsByChainId(state: FeatureFlagsMetaMaskState) {
+  const chainId = getCurrentChainId(state);
+  const networkName = getNetworkNameByChainId(chainId);
+  const featureFlags = state.metamask.swapsState?.swapsFeatureFlags;
+  if (!featureFlags?.[networkName]) {
+    return null;
+  }
+  return {
+    smartTransactions: {
+      ...featureFlags.smartTransactions,
+      ...featureFlags[networkName].smartTransactions,
+    },
+  };
+}
diff --git a/shared/modules/selectors/index.test.ts b/shared/modules/selectors/index.test.ts
new file mode 100644
index 000000000000..b2174eadcc8a
--- /dev/null
+++ b/shared/modules/selectors/index.test.ts
@@ -0,0 +1,244 @@
+import { createSwapsMockStore } from '../../../test/jest';
+import { CHAIN_IDS, CURRENCY_SYMBOLS } from '../../constants/network';
+import {
+  getSmartTransactionsOptInStatus,
+  getCurrentChainSupportsSmartTransactions,
+  getSmartTransactionsEnabled,
+  getIsSmartTransaction,
+} from '.';
+
+describe('Selectors', () => {
+  const createMockState = () => {
+    return {
+      metamask: {
+        preferences: {
+          smartTransactionsOptInStatus: true,
+        },
+        internalAccounts: {
+          selectedAccount: 'account1',
+          accounts: {
+            account1: {
+              metadata: {
+                keyring: {
+                  type: 'Hardware',
+                },
+              },
+            },
+          },
+        },
+        providerConfig: {
+          chainId: CHAIN_IDS.MAINNET,
+        },
+        swapsState: {
+          swapsFeatureFlags: {
+            ethereum: {
+              extensionActive: true,
+              mobileActive: false,
+              smartTransactions: {
+                expectedDeadline: 45,
+                maxDeadline: 150,
+                returnTxHashAsap: false,
+              },
+            },
+            smartTransactions: {
+              extensionActive: true,
+              mobileActive: false,
+            },
+          },
+        },
+        smartTransactionsState: {
+          liveness: true,
+        },
+        networkConfigurations: {
+          'network-configuration-id-1': {
+            chainId: CHAIN_IDS.MAINNET,
+            ticker: CURRENCY_SYMBOLS.ETH,
+            rpcUrl: 'https://mainnet.infura.io/v3/',
+          },
+        },
+      },
+    };
+  };
+
+  describe('getSmartTransactionsOptInStatus', () => {
+    it('should return the smart transactions opt-in status', () => {
+      const state = createMockState();
+      const result = getSmartTransactionsOptInStatus(state);
+      expect(result).toBe(true);
+    });
+  });
+
+  describe('getCurrentChainSupportsSmartTransactions', () => {
+    it('should return true if the chain ID is allowed for smart transactions', () => {
+      const state = createMockState();
+      const result = getCurrentChainSupportsSmartTransactions(state);
+      expect(result).toBe(true);
+    });
+
+    it('should return false if the chain ID is not allowed for smart transactions', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.POLYGON,
+          },
+        },
+      };
+      const result = getCurrentChainSupportsSmartTransactions(newState);
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('getSmartTransactionsEnabled', () => {
+    it('returns true if feature flag is enabled, not a HW and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      expect(getSmartTransactionsEnabled(state)).toBe(true);
+    });
+
+    it('returns false if feature flag is disabled, not a HW and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      state.metamask.swapsState.swapsFeatureFlags.smartTransactions.extensionActive =
+        false;
+      expect(getSmartTransactionsEnabled(state)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW, STX liveness is false and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      state.metamask.smartTransactionsState.liveness = false;
+      expect(getSmartTransactionsEnabled(state)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, is a HW and is Ethereum network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          internalAccounts: {
+            ...state.metamask.internalAccounts,
+            selectedAccount: 'account2',
+            accounts: {
+              account2: {
+                metadata: {
+                  keyring: {
+                    type: 'Trezor Hardware',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW and is Polygon network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.POLYGON,
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW and is BSC network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.BSC,
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if feature flag is enabled, not a HW and is Linea network', () => {
+      const state = createSwapsMockStore();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.LINEA_MAINNET,
+          },
+        },
+      };
+      expect(getSmartTransactionsEnabled(newState)).toBe(false);
+    });
+
+    it('returns false if a snap account is used', () => {
+      const state = createSwapsMockStore();
+      state.metamask.internalAccounts.selectedAccount =
+        '36eb02e0-7925-47f0-859f-076608f09b69';
+      expect(getSmartTransactionsEnabled(state)).toBe(false);
+    });
+  });
+
+  describe('getIsSmartTransaction', () => {
+    it('should return true if smart transactions are opt-in and enabled', () => {
+      const state = createMockState();
+      const result = getIsSmartTransaction(state);
+      expect(result).toBe(true);
+    });
+
+    it('should return false if smart transactions are not opt-in', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          preferences: {
+            ...state.metamask.preferences,
+            smartTransactionsOptInStatus: false,
+          },
+        },
+      };
+      const result = getIsSmartTransaction(newState);
+      expect(result).toBe(false);
+    });
+
+    it('should return false if smart transactions are not enabled', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          swapsState: {
+            ...state.metamask.swapsState,
+            swapsFeatureFlags: {
+              ethereum: {
+                extensionActive: true,
+                mobileActive: false,
+                smartTransactions: {
+                  expectedDeadline: 45,
+                  maxDeadline: 150,
+                  returnTxHashAsap: false,
+                },
+              },
+              smartTransactions: {
+                extensionActive: false,
+                mobileActive: false,
+              },
+            },
+          },
+        },
+      };
+      const result = getIsSmartTransaction(newState);
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/shared/modules/selectors/index.ts b/shared/modules/selectors/index.ts
new file mode 100644
index 000000000000..79362360877f
--- /dev/null
+++ b/shared/modules/selectors/index.ts
@@ -0,0 +1,2 @@
+export * from './smart-transactions';
+export * from './feature-flags';
diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts
new file mode 100644
index 000000000000..24994f1ec203
--- /dev/null
+++ b/shared/modules/selectors/smart-transactions.ts
@@ -0,0 +1,127 @@
+import type { Hex } from '@metamask/utils';
+import {
+  getAllowedSmartTransactionsChainIds,
+  SKIP_STX_RPC_URL_CHECK_CHAIN_IDS,
+} from '../../constants/smartTransactions';
+import {
+  getCurrentChainId,
+  getCurrentNetwork,
+  accountSupportsSmartTx,
+} from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file.
+import { isProduction } from '../environment';
+
+type SmartTransactionsMetaMaskState = {
+  metamask: {
+    preferences: {
+      smartTransactionsOptInStatus?: boolean | null;
+    };
+    internalAccounts: {
+      selectedAccount: string;
+      accounts: {
+        [key: string]: {
+          metadata: {
+            keyring: {
+              type: string;
+            };
+          };
+        };
+      };
+    };
+    providerConfig: {
+      chainId: Hex;
+    };
+    swapsState: {
+      swapsFeatureFlags: {
+        ethereum: {
+          extensionActive: boolean;
+          mobileActive: boolean;
+          smartTransactions: {
+            expectedDeadline?: number;
+            maxDeadline?: number;
+            returnTxHashAsap?: boolean;
+          };
+        };
+        smartTransactions: {
+          extensionActive: boolean;
+          mobileActive: boolean;
+        };
+      };
+    };
+    smartTransactionsState: {
+      liveness: boolean;
+    };
+    networkConfigurations: {
+      [key: string]: {
+        chainId: Hex;
+        rpcUrl: string;
+      };
+    };
+  };
+};
+
+export const getSmartTransactionsOptInStatus = (
+  state: SmartTransactionsMetaMaskState,
+): boolean | null => {
+  return state.metamask.preferences?.smartTransactionsOptInStatus ?? null;
+};
+
+export const getCurrentChainSupportsSmartTransactions = (
+  state: SmartTransactionsMetaMaskState,
+): boolean => {
+  const chainId = getCurrentChainId(state);
+  return getAllowedSmartTransactionsChainIds().includes(chainId);
+};
+
+const getIsAllowedRpcUrlForSmartTransactions = (
+  state: SmartTransactionsMetaMaskState,
+) => {
+  const chainId = getCurrentChainId(state);
+  if (!isProduction() || SKIP_STX_RPC_URL_CHECK_CHAIN_IDS.includes(chainId)) {
+    // Allow any STX RPC URL in development and testing environments or for specific chain IDs.
+    return true;
+  }
+  const currentNetwork = getCurrentNetwork(state);
+  if (!currentNetwork?.rpcUrl) {
+    return false;
+  }
+  const rpcUrl = new URL(currentNetwork.rpcUrl);
+  // Only allow STX in prod if an Infura RPC URL is being used.
+  return rpcUrl?.hostname?.endsWith('.infura.io');
+};
+
+export const getIsSmartTransactionsOptInModalAvailable = (
+  state: SmartTransactionsMetaMaskState,
+) => {
+  return (
+    getCurrentChainSupportsSmartTransactions(state) &&
+    getIsAllowedRpcUrlForSmartTransactions(state) &&
+    getSmartTransactionsOptInStatus(state) === null
+  );
+};
+
+export const getSmartTransactionsEnabled = (
+  state: SmartTransactionsMetaMaskState,
+): boolean => {
+  const supportedAccount = accountSupportsSmartTx(state);
+  // TODO: Create a new proxy service only for MM feature flags.
+  const smartTransactionsFeatureFlagEnabled =
+    state.metamask.swapsState?.swapsFeatureFlags?.smartTransactions
+      ?.extensionActive;
+  const smartTransactionsLiveness =
+    state.metamask.smartTransactionsState?.liveness;
+  return Boolean(
+    getCurrentChainSupportsSmartTransactions(state) &&
+      getIsAllowedRpcUrlForSmartTransactions(state) &&
+      supportedAccount &&
+      smartTransactionsFeatureFlagEnabled &&
+      smartTransactionsLiveness,
+  );
+};
+
+export const getIsSmartTransaction = (
+  state: SmartTransactionsMetaMaskState,
+): boolean => {
+  const smartTransactionsOptInStatus = getSmartTransactionsOptInStatus(state);
+  const smartTransactionsEnabled = getSmartTransactionsEnabled(state);
+  return Boolean(smartTransactionsOptInStatus && smartTransactionsEnabled);
+};
diff --git a/sonar-project.properties b/sonar-project.properties
index 4b696125ff11..de14094b965e 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -15,4 +15,4 @@ sonar.sources=app/
 sonar.test.inclusions=**.test.**
 
 # Encoding of the source code. Default is default system encoding
-sonar.sourceEncoding=UTF-8
\ No newline at end of file
+sonar.sourceEncoding=UTF-8
diff --git a/test/data/confirmations/contract-interaction.ts b/test/data/confirmations/contract-interaction.ts
new file mode 100644
index 000000000000..dd0500bbaec2
--- /dev/null
+++ b/test/data/confirmations/contract-interaction.ts
@@ -0,0 +1,150 @@
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import { Confirmation } from '../../../ui/pages/confirmations/types/confirm';
+
+export const CONTRACT_INTERACTION_SENDER_ADDRESS =
+  '0x2e0d7e8c45221fca00d74a3609a0f7097035d09b';
+
+export const DEPOSIT_METHOD_DATA = '0xd0e30db0';
+
+export const genUnapprovedContractInteractionConfirmation = (
+  { address, txData } = {
+    address: CONTRACT_INTERACTION_SENDER_ADDRESS,
+    txData: DEPOSIT_METHOD_DATA,
+  },
+): Confirmation => ({
+  actionId: String(400855682),
+  chainId: '0xaa36a7',
+  dappSuggestedGasFees: {
+    gas: '0xab77',
+  },
+  defaultGasEstimates: {
+    estimateType: 'medium',
+    gas: '0xab77',
+    maxFeePerGas: '0xaa350353',
+    maxPriorityFeePerGas: '0x59682f00',
+  },
+  gasFeeEstimatesLoaded: true,
+  history: [
+    {
+      actionId: String(400855682),
+      chainId: '0xaa36a7',
+      dappSuggestedGasFees: {
+        gas: '0xab77',
+      },
+      defaultGasEstimates: {
+        estimateType: 'medium',
+        gas: '0xab77',
+        maxFeePerGas: '0xaa350353',
+        maxPriorityFeePerGas: '0x59682f00',
+      },
+      id: '1d7c08c0-fe54-11ee-9243-91b1e533746a',
+      origin: 'https://metamask.github.io',
+      securityAlertResponse: {
+        reason: 'loading',
+        result_type: 'validation_in_progress',
+      },
+      sendFlowHistory: [],
+      status: TransactionStatus.unapproved,
+      time: 1713534772044,
+      txParams: {
+        data: txData,
+        from: address,
+        gas: '0xab77',
+        maxFeePerGas: '0xaa350353',
+        maxPriorityFeePerGas: '0x59682f00',
+        to: '0x88aa6343307ec9a652ccddda3646e62b2f1a5125',
+        value: '0x3782dace9d900000',
+      },
+      type: TransactionType.contractInteraction,
+      userEditedGasLimit: false,
+      userFeeLevel: 'medium',
+      verifiedOnBlockchain: false,
+    },
+    [
+      {
+        note: 'TransactionController#updateSimulationData - Update simulation data',
+        op: 'add',
+        path: '/simulationData',
+        timestamp: 1713534772417,
+        value: {
+          nativeBalanceChange: {
+            difference: '0x3782dace9d900000',
+            isDecrease: true,
+            newBalance: '0xcc0ea4fb7ffa87d',
+            previousBalance: '0x4443c51e558fa87d',
+          },
+          tokenBalanceChanges: [],
+        },
+      },
+      {
+        op: 'add',
+        path: '/gasFeeEstimatesLoaded',
+        value: true,
+      },
+    ],
+    [
+      {
+        note: 'TransactionController:updatesecurityAlertResponse - securityAlertResponse updated',
+        op: 'replace',
+        path: '/securityAlertResponse/result_type',
+        timestamp: 1713534773213,
+        value: 'Benign',
+      },
+      {
+        op: 'replace',
+        path: '/securityAlertResponse/reason',
+        value: '',
+      },
+      {
+        op: 'add',
+        path: '/securityAlertResponse/description',
+        value: '',
+      },
+      {
+        op: 'add',
+        path: '/securityAlertResponse/features',
+        value: [],
+      },
+      {
+        op: 'add',
+        path: '/securityAlertResponse/block',
+        value: 5732063,
+      },
+    ],
+  ],
+  id: '1d7c08c0-fe54-11ee-9243-91b1e533746a',
+  origin: 'https://metamask.github.io',
+  securityAlertResponse: {
+    features: [],
+    reason: '',
+    result_type: 'Benign',
+  },
+  sendFlowHistory: [],
+  simulationData: {
+    nativeBalanceChange: {
+      difference: '0x3782dace9d900000',
+      isDecrease: true,
+      newBalance: '0xcc0ea4fb7ffa87d',
+      previousBalance: '0x4443c51e558fa87d',
+    },
+    tokenBalanceChanges: [],
+  },
+  status: TransactionStatus.unapproved,
+  time: 1713534772044,
+  txParams: {
+    data: txData,
+    from: address,
+    gas: '0xab77',
+    maxFeePerGas: '0xaa350353',
+    maxPriorityFeePerGas: '0x59682f00',
+    to: '0x88aa6343307ec9a652ccddda3646e62b2f1a5125',
+    value: '0x3782dace9d900000',
+  },
+  type: TransactionType.contractInteraction,
+  userEditedGasLimit: false,
+  userFeeLevel: 'medium',
+  verifiedOnBlockchain: false,
+});
diff --git a/test/data/confirmations/personal_sign.ts b/test/data/confirmations/personal_sign.ts
index c49efd3bda1a..ee2193389a51 100644
--- a/test/data/confirmations/personal_sign.ts
+++ b/test/data/confirmations/personal_sign.ts
@@ -1,3 +1,5 @@
+export const PERSONAL_SIGN_SENDER_ADDRESS = '0x8eeee1781fd885ff5ddef7789486676961873d12';
+
 export const unapprovedPersonalSignMsg = {
   id: '0050d5b0-c023-11ee-a0cb-3390a510a0ab',
   status: 'unapproved',
@@ -5,7 +7,7 @@ export const unapprovedPersonalSignMsg = {
   type: 'personal_sign',
   securityProviderResponse: null,
   msgParams: {
-    from: '0x8eeee1781fd885ff5ddef7789486676961873d12',
+    from: PERSONAL_SIGN_SENDER_ADDRESS,
     data: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
     origin: 'https://metamask.github.io',
     siwe: { isSIWEMessage: false, parsedMessage: null },
diff --git a/test/data/confirmations/typed_sign.ts b/test/data/confirmations/typed_sign.ts
index 23f8cf45fce2..58ce0d068dc0 100644
--- a/test/data/confirmations/typed_sign.ts
+++ b/test/data/confirmations/typed_sign.ts
@@ -1,3 +1,26 @@
+export const unapprovedTypedSignMsgV1 = {
+  id: '82ab2400-e2c6-11ee-9627-73cc88f00492',
+  securityAlertResponse: {
+    reason: 'loading',
+    result_type: 'validation_in_progress',
+    securityAlertId: '3a938cfc-301d-4af0-96c4-b51fe1a5d6ad',
+  },
+  status: 'unapproved',
+  time: 1710505271872,
+  type: 'eth_signTypedData',
+  securityProviderResponse: null,
+  msgParams: {
+    from: '0x935e73edb9ff52e23bac7f7e043a1ecd06d05477',
+    data: [
+      { type: 'string', name: 'Message', value: 'Hi, Alice!' },
+      { type: 'uint32', name: 'A number', value: '1337' },
+    ],
+    signatureMethod: 'eth_signTypedData',
+    version: 'V1',
+    origin: 'https://metamask.github.io',
+  },
+};
+
 const rawMessageV3 = {
   types: {
     EIP712Domain: [
diff --git a/test/e2e/tests/metrics/mock-data.js b/test/data/mock-data.js
similarity index 99%
rename from test/e2e/tests/metrics/mock-data.js
rename to test/data/mock-data.js
index fe68d8e7d29c..d37c4f4bc686 100644
--- a/test/e2e/tests/metrics/mock-data.js
+++ b/test/data/mock-data.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 const TOKENS_API_MOCK_RESULT = [
   {
     name: 'Ethereum',
diff --git a/test/data/mock-send-state.json b/test/data/mock-send-state.json
index badc99d28341..5519a55165c8 100644
--- a/test/data/mock-send-state.json
+++ b/test/data/mock-send-state.json
@@ -1262,7 +1262,7 @@
     "gasIsSetInModal": false,
     "gasPriceEstimate": "0x0",
     "gasLimitMinimum": "0x5208",
-    "gasTotalForLayer1": "0x0",
+    "gasTotalForLayer1": null,
     "recipientMode": "CONTACT_LIST",
     "recipientInput": "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b",
     "selectedAccount": {
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index ee8531ee7f8a..d4d6555504f8 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -365,6 +365,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": true,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": false
     },
diff --git a/test/e2e/accounts/account-custom-name.spec.ts b/test/e2e/accounts/account-custom-name.spec.ts
new file mode 100644
index 000000000000..d88da7155784
--- /dev/null
+++ b/test/e2e/accounts/account-custom-name.spec.ts
@@ -0,0 +1,90 @@
+import { Suite } from 'mocha';
+import {
+  unlockWallet,
+  withFixtures,
+  waitForAccountRendered,
+  findAnotherAccountFromAccountList,
+} from '../helpers';
+import FixtureBuilder from '../fixture-builder';
+import { Driver } from '../webdriver/driver';
+
+const newAccountLabel = 'Custom name';
+const anotherAccountLabel = '2nd custom name';
+
+describe('Account Custom Name Persistence', function (this: Suite) {
+  it('persists custom account label through account change and wallet lock', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }: { driver: Driver }) => {
+        await unlockWallet(driver);
+
+        // Change account label for existing account
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement('[data-testid="account-list-menu-details"]');
+        await driver.clickElement('[data-testid="editable-label-button"]');
+        await driver.fill('input[placeholder="Account name"]', newAccountLabel);
+        await driver.clickElement('[data-testid="save-account-label-input"]');
+        await driver.clickElement('button[aria-label="Close"]');
+
+        // Verify account label
+        await driver.findElement({
+          css: '[data-testid="account-menu-icon"]',
+          text: newAccountLabel,
+        });
+
+        // Add new account with custom label
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-action-button"]',
+        );
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-add-account"]',
+        );
+        await driver.fill('[placeholder="Account 2"]', anotherAccountLabel);
+        await driver.clickElement({ text: 'Create', tag: 'button' });
+        await waitForAccountRendered(driver);
+
+        // Verify initial custom account label after freshly added account was active
+        const accountOneSelector = await findAnotherAccountFromAccountList(
+          driver,
+          1,
+          newAccountLabel,
+        );
+        await driver.clickElement(accountOneSelector);
+        await driver.findElement({
+          css: '[data-testid="account-menu-icon"]',
+          text: newAccountLabel,
+        });
+
+        // Lock and unlock wallet
+        await driver.waitForSelector(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement({
+          text: 'Lock MetaMask',
+          tag: 'div',
+        });
+        await unlockWallet(driver);
+
+        // Verify both account labels persist after unlock
+        await driver.findElement({
+          css: '[data-testid="account-menu-icon"]',
+          text: newAccountLabel,
+        });
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        await driver.findElement({
+          css: `.multichain-account-list-item__account-name__button`,
+          text: anotherAccountLabel,
+        });
+      },
+    );
+  });
+});
diff --git a/test/e2e/accounts/common.ts b/test/e2e/accounts/common.ts
index c8b448dd1b58..30a0fe791739 100644
--- a/test/e2e/accounts/common.ts
+++ b/test/e2e/accounts/common.ts
@@ -65,14 +65,14 @@ export async function installSnapSimpleKeyring(
     tag: 'button',
   });
 
-  await driver.findElement({ text: 'Installation request', tag: 'h2' });
+  await driver.findElement({ text: 'Add to MetaMask', tag: 'h3' });
 
   await driver.clickElementSafe('[data-testid="snap-install-scroll"]', 200);
 
-  await driver.waitForSelector({ text: 'Install' });
+  await driver.waitForSelector({ text: 'Confirm' });
 
   await driver.clickElement({
-    text: 'Install',
+    text: 'Confirm',
     tag: 'button',
   });
 
@@ -193,7 +193,7 @@ export async function connectAccountToTestDapp(driver: Driver) {
     css: '[data-testid="page-container-footer-next"]',
   });
   await driver.clickElement({
-    text: 'Connect',
+    text: 'Confirm',
     tag: 'button',
     css: '[data-testid="page-container-footer-next"]',
   });
@@ -202,9 +202,15 @@ export async function connectAccountToTestDapp(driver: Driver) {
 export async function disconnectFromTestDapp(driver: Driver) {
   await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
   await driver.clickElement('[data-testid="account-options-menu-button"]');
-  await driver.clickElement('[data-testid="global-menu-connected-sites"]');
-  await driver.clickElement({ text: 'Disconnect', tag: 'a' });
+  await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+  await driver.clickElement({ text: 'Got it', tag: 'button' });
+  await driver.clickElement({
+    text: '127.0.0.1:8080',
+    tag: 'p',
+  });
+  await driver.clickElement('[data-testid="account-list-item-menu-button"]');
   await driver.clickElement({ text: 'Disconnect', tag: 'button' });
+  await driver.clickElement('[data-testid ="disconnect-all"]');
 }
 
 export async function approveOrRejectRequest(driver: Driver, flowType: string) {
diff --git a/test/e2e/accounts/create-snap-account.spec.ts b/test/e2e/accounts/create-snap-account.spec.ts
index dce3735a226f..ab34ac0046c0 100644
--- a/test/e2e/accounts/create-snap-account.spec.ts
+++ b/test/e2e/accounts/create-snap-account.spec.ts
@@ -33,12 +33,13 @@ describe('Create Snap Account', function (this: Suite) {
         });
 
         // scroll to the bottom of the page
+        await driver.waitForSelector({ text: 'Confirm' });
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         // click the install button to install the snap
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
         await driver.waitForSelector({ text: 'OK' });
@@ -111,12 +112,13 @@ describe('Create Snap Account', function (this: Suite) {
         });
 
         // scroll to the bottom of the page
+        await driver.waitForSelector({ text: 'Confirm' });
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         // click the install button to install the snap
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
         await driver.waitForSelector({ text: 'OK' });
@@ -202,12 +204,13 @@ describe('Create Snap Account', function (this: Suite) {
         });
 
         // scroll to the bottom of the page
+        await driver.waitForSelector({ text: 'Confirm' });
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         // click the install button to install the snap
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
         await driver.waitForSelector({ text: 'OK' });
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 6445bba5b085..001820222ecb 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -156,6 +156,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
       PreferencesController: {
         advancedGasFee: null,
         currentLocale: 'en',
+        useExternalServices: true,
         dismissSeedBackUpReminder: true,
         featureFlags: {},
         forgottenPassword: false,
@@ -176,6 +177,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
           showExtensionInFullSizeView: false,
           showFiatInTestnets: false,
           showTestNetworks: false,
+          smartTransactionsOptInStatus: false,
           useNativeCurrencyAsPrimaryCurrency: true,
           petnamesEnabled: true,
         },
@@ -188,7 +190,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
         useTokenDetection: false,
         useCurrencyRateCheck: true,
         useMultiAccountBalanceChecker: true,
-        useRequestQueue: false,
+        useRequestQueue: true,
       },
       SelectedNetworkController: {
         domains: {},
@@ -302,9 +304,11 @@ function onboardingFixture() {
           showExtensionInFullSizeView: false,
           showFiatInTestnets: false,
           showTestNetworks: false,
+          smartTransactionsOptInStatus: false,
           useNativeCurrencyAsPrimaryCurrency: true,
           petnamesEnabled: true,
         },
+        useExternalServices: true,
         theme: 'light',
         useBlockie: false,
         useNftDetection: false,
@@ -313,7 +317,7 @@ function onboardingFixture() {
         useTokenDetection: false,
         useCurrencyRateCheck: true,
         useMultiAccountBalanceChecker: true,
-        useRequestQueue: false,
+        useRequestQueue: true,
       },
       SelectedNetworkController: {
         domains: {},
@@ -474,6 +478,23 @@ class FixtureBuilder {
     });
   }
 
+  withNetworkControllerTripleGanache() {
+    this.withNetworkControllerDoubleGanache();
+    merge(this.fixture.data.NetworkController, {
+      networkConfigurations: {
+        '243ad4c2-10a6-4621-9536-e3a67f4dd4c9': {
+          id: '243ad4c2-10a6-4621-9536-e3a67f4dd4c9',
+          rpcUrl: 'http://localhost:7777',
+          chainId: '0x3e8',
+          ticker: 'ETH',
+          nickname: 'Localhost 7777',
+          rpcPrefs: {},
+        },
+      },
+    });
+    return this;
+  }
+
   withNftController(data) {
     merge(
       this.fixture.data.NftController
@@ -881,9 +902,11 @@ class FixtureBuilder {
   }
 
   withPreferencesControllerUseRequestQueueEnabled() {
-    return this.withPreferencesController({
-      useRequestQueue: true,
-    });
+    return merge(
+      this.withPreferencesController({
+        useRequestQueue: true,
+      }),
+    );
   }
 
   withSmartTransactionsController(data) {
diff --git a/test/e2e/flask/user-operations.spec.ts b/test/e2e/flask/user-operations.spec.ts
index 8f1f11ecb36e..b239c426d1cf 100644
--- a/test/e2e/flask/user-operations.spec.ts
+++ b/test/e2e/flask/user-operations.spec.ts
@@ -39,10 +39,10 @@ async function installExampleSnap(driver: Driver) {
     text: 'Connect',
     tag: 'button',
   });
-  await driver.findElement({ text: 'Installation request', tag: 'h2' });
+  await driver.findElement({ text: 'Add to MetaMask', tag: 'h3' });
   await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
   await driver.clickElement({
-    text: 'Install',
+    text: 'Confirm',
     tag: 'button',
   });
   await driver.clickElement({
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 1f4d382324e8..6bdb90625be4 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -8,7 +8,7 @@ const { difference } = require('lodash');
 const createStaticServer = require('../../development/create-static-server');
 const { tEn } = require('../lib/i18n-helpers');
 const { setupMocking } = require('./mock-e2e');
-const { Ganache } = require('./ganache');
+const { Ganache } = require('./seeder/ganache');
 const FixtureServer = require('./fixture-server');
 const PhishingWarningPageServer = require('./phishing-warning-page-server');
 const { buildWebDriver } = require('./webdriver');
@@ -57,7 +57,7 @@ async function withFixtures(options, testSuite) {
   const bundlerServer = new Bundler();
   const https = await mockttp.generateCACertificate();
   const mockServer = mockttp.getLocal({ https, cors: true });
-  let secondaryGanacheServer;
+  const secondaryGanacheServer = [];
   let numberOfDapps = dapp ? 1 : 0;
   const dappServer = [];
   const phishingPageServer = new PhishingWarningPageServer();
@@ -71,19 +71,28 @@ async function withFixtures(options, testSuite) {
 
     if (smartContract) {
       const ganacheSeeder = new GanacheSeeder(ganacheServer.getProvider());
-      await ganacheSeeder.deploySmartContract(smartContract);
+      const contracts =
+        smartContract instanceof Array ? smartContract : [smartContract];
+      await Promise.all(
+        contracts.map((contract) =>
+          ganacheSeeder.deploySmartContract(contract),
+        ),
+      );
       contractRegistry = ganacheSeeder.getContractRegistry();
     }
 
     if (ganacheOptions?.concurrent) {
-      const { port, chainId, ganacheOptions2 } = ganacheOptions.concurrent;
-      secondaryGanacheServer = new Ganache();
-      await secondaryGanacheServer.start({
-        blockTime: 2,
-        chain: { chainId },
-        port,
-        vmErrorsOnRPCResponse: false,
-        ...ganacheOptions2,
+      ganacheOptions.concurrent.forEach(async (ganacheSettings) => {
+        const { port, chainId, ganacheOptions2 } = ganacheSettings;
+        const server = new Ganache();
+        secondaryGanacheServer.push(server);
+        await server.start({
+          blockTime: 2,
+          chain: { chainId },
+          port,
+          vmErrorsOnRPCResponse: false,
+          ...ganacheOptions2,
+        });
       });
     }
 
@@ -200,7 +209,7 @@ async function withFixtures(options, testSuite) {
       ...new Set([...privacyReport, ...privacySnapshot]),
     ].sort();
 
-    // To determine if a new host was requsted, we use the lodash difference
+    // To determine if a new host was requested, we use the lodash difference
     // method to generate an array of the items included in the first argument
     // but not in the second
     const newHosts = difference(mergedReport, privacySnapshot);
@@ -255,7 +264,9 @@ async function withFixtures(options, testSuite) {
       await ganacheServer.quit();
 
       if (ganacheOptions?.concurrent) {
-        await secondaryGanacheServer.quit();
+        secondaryGanacheServer.forEach(async (server) => {
+          await server.quit();
+        });
       }
 
       if (useBundler) {
@@ -307,12 +318,12 @@ const WINDOW_TITLES = Object.freeze({
 });
 
 /**
- * @param {*} driver - selinium driver
+ * @param {*} driver - Selenium driver
  * @param {*} handlesCount - total count of windows that should be loaded
  * @returns handles - an object with window handles, properties in object represent windows:
- *            1. extension: metamask extension window
+ *            1. extension: MetaMask extension window
  *            2. dapp: test-app window
- *            3. popup: metsmask extension popup window
+ *            3. popup: MetaMask extension popup window
  */
 const getWindowHandles = async (driver, handlesCount) => {
   await driver.waitUntilXWindowHandles(handlesCount);
@@ -502,9 +513,17 @@ const onboardingCompleteWalletCreationWithOptOut = async (driver) => {
   await driver.findElement({ text: 'Wallet creation successful', tag: 'h2' });
   // opt-out from third party API
   await driver.clickElement({ text: 'Advanced configuration', tag: 'a' });
+  await driver.clickElement(
+    '[data-testid="basic-functionality-toggle"] .toggle-button',
+  );
+  await driver.clickElement('[id="basic-configuration-checkbox"]');
+  await driver.clickElement({ text: 'Turn off', tag: 'button' });
+
   await Promise.all(
     (
-      await driver.findClickableElements('.toggle-button.toggle-button--on')
+      await driver.findClickableElements(
+        '.toggle-button.toggle-button--on:not([data-testid="basic-functionality-toggle"] .toggle-button)',
+      )
     ).map((toggle) => toggle.click()),
   );
   // complete onboarding
@@ -683,7 +702,7 @@ const connectToDapp = async (driver) => {
     tag: 'button',
   });
   await driver.clickElement({
-    text: 'Connect',
+    text: 'Confirm',
     tag: 'button',
   });
   await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
@@ -734,7 +753,7 @@ const generateGanacheOptions = ({
 };
 
 // Edit priority gas fee form
-const editGasfeeForm = async (driver, gasLimit, gasPrice) => {
+const editGasFeeForm = async (driver, gasLimit, gasPrice) => {
   const inputs = await driver.findElements('input[type="number"]');
   const gasLimitInput = inputs[0];
   const gasPriceInput = inputs[1];
@@ -863,6 +882,7 @@ async function waitForAccountRendered(driver) {
 
 /**
  * Unlock the wallet with the default password.
+ * This method is intended to replace driver.navigate and should not be called after driver.navigate.
  *
  * @param {WebDriver} driver - The webdriver instance
  * @param {object} options - Options for unlocking the wallet
@@ -918,7 +938,7 @@ function genRandInitBal(minETHBal = 10, maxETHBal = 100, decimalPlaces = 4) {
 }
 
 /**
- * This method handles clicking the sign button on signature confrimation
+ * This method handles clicking the sign button on signature confirmation
  * screen.
  *
  * @param {WebDriver} driver
@@ -1081,7 +1101,7 @@ async function initBundler(bundlerServer, ganacheServer, usePaymaster) {
 
     await bundlerServer.start();
   } catch (error) {
-    console.log('Failed to initialise bundler', error);
+    console.log('Failed to initialize bundler', error);
     throw error;
   }
 }
@@ -1148,5 +1168,5 @@ module.exports = {
   genRandInitBal,
   openActionMenuAndStartSendFlow,
   getCleanAppState,
-  editGasfeeForm,
+  editGasFeeForm,
 };
diff --git a/test/e2e/json-rpc/switchEthereumChain.spec.js b/test/e2e/json-rpc/switchEthereumChain.spec.js
index e255f7b894dd..64d1b003dc36 100644
--- a/test/e2e/json-rpc/switchEthereumChain.spec.js
+++ b/test/e2e/json-rpc/switchEthereumChain.spec.js
@@ -20,15 +20,38 @@ describe('Switch Ethereum Chain for two dapps', function () {
           .withNetworkControllerDoubleGanache()
           .build(),
         dappOptions: { numberOfDapps: 2 },
+
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
         await unlockWallet(driver);
 
+        // Open settings menu button
+        const accountOptionsMenuSelector =
+          '[data-testid="account-options-menu-button"]';
+        await driver.waitForSelector(accountOptionsMenuSelector);
+        await driver.clickElement(accountOptionsMenuSelector);
+
+        // Click settings from dropdown menu
+        const globalMenuSettingsSelector =
+          '[data-testid="global-menu-settings"]';
+        await driver.waitForSelector(globalMenuSettingsSelector);
+        await driver.clickElement(globalMenuSettingsSelector);
+
+        // Click Experimental tab
+        const experimentalTabRawLocator = {
+          text: 'Experimental',
+          tag: 'div',
+        };
+        await driver.clickElement(experimentalTabRawLocator);
+
+        // Toggle off request queue setting (on by default now)
+        await driver.clickElement('.request-queue-toggle');
+
         // open two dapps
         await openDapp(driver, undefined, DAPP_URL);
         await openDapp(driver, undefined, DAPP_ONE_URL);
@@ -50,7 +73,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
           `window.ethereum.request(${switchEthereumChainRequest})`,
         );
 
-        // Confirm switchEtheruemChain
+        // Confirm switchEthereumChain
         await switchToNotificationWindow(driver, 4);
         await driver.findClickableElements({
           text: 'Switch network',
@@ -92,13 +115,35 @@ describe('Switch Ethereum Chain for two dapps', function () {
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
         await unlockWallet(driver);
 
+        // Open settings menu button
+        const accountOptionsMenuSelector =
+          '[data-testid="account-options-menu-button"]';
+        await driver.waitForSelector(accountOptionsMenuSelector);
+        await driver.clickElement(accountOptionsMenuSelector);
+
+        // Click settings from dropdown menu
+        const globalMenuSettingsSelector =
+          '[data-testid="global-menu-settings"]';
+        await driver.waitForSelector(globalMenuSettingsSelector);
+        await driver.clickElement(globalMenuSettingsSelector);
+
+        // Click Experimental tab
+        const experimentalTabRawLocator = {
+          text: 'Experimental',
+          tag: 'div',
+        };
+        await driver.clickElement(experimentalTabRawLocator);
+
+        // Toggle off request queue setting (on by default now)
+        await driver.clickElement('.request-queue-toggle');
+
         // open two dapps
         await openDapp(driver, undefined, DAPP_URL);
         await openDapp(driver, undefined, DAPP_ONE_URL);
@@ -164,13 +209,35 @@ describe('Switch Ethereum Chain for two dapps', function () {
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
         await unlockWallet(driver);
 
+        // Open settings menu button
+        const accountOptionsMenuSelector =
+          '[data-testid="account-options-menu-button"]';
+        await driver.waitForSelector(accountOptionsMenuSelector);
+        await driver.clickElement(accountOptionsMenuSelector);
+
+        // Click settings from dropdown menu
+        const globalMenuSettingsSelector =
+          '[data-testid="global-menu-settings"]';
+        await driver.waitForSelector(globalMenuSettingsSelector);
+        await driver.clickElement(globalMenuSettingsSelector);
+
+        // Click Experimental tab
+        const experimentalTabRawLocator = {
+          text: 'Experimental',
+          tag: 'div',
+        };
+        await driver.clickElement(experimentalTabRawLocator);
+
+        // Toggle off request queue setting (on by default now)
+        await driver.clickElement('.request-queue-toggle');
+
         // open two dapps
         await openDapp(driver, undefined, DAPP_URL);
         await openDapp(driver, undefined, DAPP_ONE_URL);
@@ -206,7 +273,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
         await driver.clickElement('#sendButton');
         await driver.delay(2000);
 
-        // Switch to nofication that should still be switchEthereumChain request but with an warning.
+        // Switch to notification that should still be switchEthereumChain request but with a warning.
         await switchToNotificationWindow(driver, 4);
 
         await driver.findElement({
@@ -214,7 +281,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
           text: 'Switching networks will cancel all pending confirmations',
         });
 
-        // Confirm switchEtheruemChain with queued pending tx
+        // Confirm switchEthereumChain with queued pending tx
         await driver.clickElement({ text: 'Switch network', tag: 'button' });
 
         // Window handles should only be expanded mm, dapp one, dapp 2 (3 total)
@@ -237,13 +304,35 @@ describe('Switch Ethereum Chain for two dapps', function () {
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         },
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
         await unlockWallet(driver);
 
+        // Open settings menu button
+        const accountOptionsMenuSelector =
+          '[data-testid="account-options-menu-button"]';
+        await driver.waitForSelector(accountOptionsMenuSelector);
+        await driver.clickElement(accountOptionsMenuSelector);
+
+        // Click settings from dropdown menu
+        const globalMenuSettingsSelector =
+          '[data-testid="global-menu-settings"]';
+        await driver.waitForSelector(globalMenuSettingsSelector);
+        await driver.clickElement(globalMenuSettingsSelector);
+
+        // Click Experimental tab
+        const experimentalTabRawLocator = {
+          text: 'Experimental',
+          tag: 'div',
+        };
+        await driver.clickElement(experimentalTabRawLocator);
+
+        // Toggle off request queue setting (on by default now)
+        await driver.clickElement('.request-queue-toggle');
+
         // open two dapps
         await openDapp(driver, undefined, DAPP_URL);
         await openDapp(driver, undefined, DAPP_ONE_URL);
@@ -287,7 +376,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
           text: 'Switching networks will cancel all pending confirmations',
         });
 
-        // Cancel switchEtheruemChain with queued pending tx
+        // Cancel switchEthereumChain with queued pending tx
         await driver.clickElement({ text: 'Cancel', tag: 'button' });
 
         // Delay for second notification of the pending tx
diff --git a/test/e2e/json-rpc/wallet_requestPermissions.spec.js b/test/e2e/json-rpc/wallet_requestPermissions.spec.js
index c564295b5d48..917e30ca12fc 100644
--- a/test/e2e/json-rpc/wallet_requestPermissions.spec.js
+++ b/test/e2e/json-rpc/wallet_requestPermissions.spec.js
@@ -43,7 +43,7 @@ describe('wallet_requestPermissions', function () {
         });
 
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/mmi/custodian-hooks/hooks.ts b/test/e2e/mmi/custodian-hooks/hooks.ts
index 40aaa3d3be2d..e41910d3cdbe 100644
--- a/test/e2e/mmi/custodian-hooks/hooks.ts
+++ b/test/e2e/mmi/custodian-hooks/hooks.ts
@@ -260,7 +260,7 @@ export class CustodianTestClient implements ICustodianTestClient {
         const diffTime = transactions.map((tx: { createdAt: string }) =>
           Math.abs(
             new Date(tx.createdAt).getTime() -
-              parseInt(signedTransactionTime, 10),
+            parseInt(signedTransactionTime, 10),
           ),
         );
         const min = Math.min(...diffTime);
@@ -346,4 +346,21 @@ export class CustodianTestClient implements ICustodianTestClient {
   async rejectPersonalSignatureId(txId: string): Promise<string | RegExp> {
     return txId;
   }
+
+  public async postConnectionRequest(data: any) {
+    return (await axios
+      .post("https://neptune-custody.dev.metamask-institutional.io/qrcode/connection-request", data, {
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      })
+      .then(function (response) {
+        expect(response.status).toBe(200);
+        return response.data;
+      })
+      .catch(function (error) {
+        console.log(error.response.data);
+        throw error;
+      })) as string;
+  }
 }
diff --git a/test/e2e/mmi/helpers/dapps-helpers.ts b/test/e2e/mmi/helpers/dapps-helpers.ts
index 855eef51af45..04492ab56ace 100644
--- a/test/e2e/mmi/helpers/dapps-helpers.ts
+++ b/test/e2e/mmi/helpers/dapps-helpers.ts
@@ -32,6 +32,8 @@ export async function callTestDappBtn(
   // Setup testnetwork in settings
   const mainMenuPage = new MMIMainMenuPage(page, extensionId as string);
   await mainMenuPage.goto();
+  await mainMenuPage.fillPassword();
+  await mainMenuPage.finishOnboarding();
   await mainMenuPage.selectMenuOption('settings');
   await mainMenuPage.selectSettings('Advance');
   await mainMenuPage.switchTestNetwork();
diff --git a/test/e2e/mmi/pageObjects/mmi-accountMenu-page.ts b/test/e2e/mmi/pageObjects/mmi-accountMenu-page.ts
index 72c049ac0c6c..5d34402662d8 100644
--- a/test/e2e/mmi/pageObjects/mmi-accountMenu-page.ts
+++ b/test/e2e/mmi/pageObjects/mmi-accountMenu-page.ts
@@ -1,6 +1,7 @@
 import { type Locator, type Page, test, expect } from '@playwright/test';
 import { getCustodianInfoByName } from '../helpers/custodian-helper';
 import { MMISaturnUIPage } from './mmi-saturn-ui-page';
+import { CustodianTestClient } from '../custodian-hooks/hooks';
 
 export class MMIAccountMenuPage {
   readonly page: Page;
@@ -46,7 +47,7 @@ export class MMIAccountMenuPage {
       .filter({ hasText: 'Select an account' });
   }
 
-  async connectCustodian(name: string, visual?: boolean) {
+  async connectCustodian(name: string, visual?: boolean, qrCode?: boolean) {
     await this.page
       .getByRole('button', { name: /Add account or hardware wallet/iu })
       .click();
@@ -61,6 +62,7 @@ export class MMIAccountMenuPage {
     }
 
     const custodian = await getCustodianInfoByName(name);
+
     await this.page
       .getByRole('list')
       .locator('div')
@@ -69,24 +71,45 @@ export class MMIAccountMenuPage {
       .getByTestId('custody-connect-button')
       .click();
 
-    await expect(
-      this.page.getByText(/connect saturn custody accounts/iu),
-    ).toBeVisible();
-    if (visual) {
-      await test.expect
-        .soft(this.page)
-        .toHaveScreenshot('custodian_connection_info.png', { fullPage: true });
+    if (qrCode) {
+      const spanElement = await this.page.$('span.hidden');
+
+      if (spanElement) {
+        let data = await spanElement.getAttribute('data-value');
+
+        while (!data) {
+          await new Promise(resolve => setTimeout(resolve, 1000));
+          data = await spanElement.getAttribute('data-value');
+        }
+
+        const client = new CustodianTestClient();
+        await client.setup();
+        await client.postConnectionRequest(data);
+        await this.page.getByTestId('select-all-accounts-selected-false').click();
+        await this.page.getByRole('button', { name: /connect/iu }).click();
+        await this.page.getByRole('button', { name: /close/iu }).first().click();
+      }
+    } else {
+      await expect(
+        this.page.getByText(/connect saturn custody accounts/iu),
+      ).toBeVisible();
+      if (visual) {
+        await test.expect
+          .soft(this.page)
+          .toHaveScreenshot('custodian_connection_info.png', { fullPage: true });
+      }
+
+      const pagePromise = this.page.context().waitForEvent('page');
+      await this.page.getByRole('button', { name: /continue/iu }).click();
+      const saturnUI = await pagePromise;
+      await saturnUI.waitForLoadState();
+
+      const saturnUIPage = new MMISaturnUIPage(saturnUI);
+      await saturnUIPage.connectMMI();
+      await this.page.getByRole('button', { name: /cancel/iu }).click();
+      await this.page.getByRole('button', { name: /back/iu }).click();
     }
 
-    const pagePromise = this.page.context().waitForEvent('page');
-    await this.page.getByRole('button', { name: /continue/iu }).click();
-    const saturnUI = await pagePromise;
-    await saturnUI.waitForLoadState();
-
-    const saturnUIPage = new MMISaturnUIPage(saturnUI);
-    await saturnUIPage.connectMMI();
-    await this.page.getByRole('button', { name: /cancel/iu }).click();
-    await this.page.getByRole('button', { name: /back/iu }).click();
   }
 
   async selectCustodyAccount(account: string) {
diff --git a/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts b/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts
index 363f86bd1d08..3aff49658f53 100644
--- a/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts
+++ b/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts
@@ -36,9 +36,8 @@ export class DummyAppPage {
     await popup1.waitForLoadState();
     // Check which account is selected and select if required
     await popup1.locator('.check-box__indeterminate');
-    // await popup1.locator('text=Custody Ac... (0x8b2...b3ad)').click()
     await popup1.locator('button:has-text("Next")').click();
-    await popup1.locator('button:has-text("Connect")').click();
+    await popup1.locator('button:has-text("Confirm")').click();
     await popup1.close();
   }
 
@@ -59,7 +58,7 @@ export class DummyAppPage {
     await popup.waitForLoadState();
 
     if (isSign) {
-      await popup.click('button:has-text("Sign")');
+      await popup.click('button:has-text("Confirm")');
     } else {
       // Confirm
       await popup.getByTestId('page-container-footer-next').click();
diff --git a/test/e2e/mmi/pageObjects/mmi-main-page.ts b/test/e2e/mmi/pageObjects/mmi-main-page.ts
index d47f9bd26ca7..c6c06b544a2c 100644
--- a/test/e2e/mmi/pageObjects/mmi-main-page.ts
+++ b/test/e2e/mmi/pageObjects/mmi-main-page.ts
@@ -25,6 +25,11 @@ export class MMIMainPage {
     await this.activityTab.click();
   }
 
+  async finishOnboarding() {
+    await this.page.getByRole('button', { name: /continue/iu }).click();
+    await this.page.getByRole('button', { name: /continue to wallet/iu }).click();
+  }
+
   async checkLastTransactionStatus(status: string | RegExp) {
     // NOTE: Assumes that transaction is the first one on the activity list
     await expect(
@@ -48,6 +53,13 @@ export class MMIMainPage {
       .getAttribute('data-custodiantransactionid')) as string;
   }
 
+  async getSecondCustodianTXId() {
+    return (await this.page
+      .locator('.test-transaction-meta')
+      .nth(1)
+      .getAttribute('data-custodiantransactionid')) as string;
+  }
+
   async selectMainAction(action: string) {
     await this.page
       .locator(`.wallet-overview__buttons >> text=${action}`)
diff --git a/test/e2e/mmi/pageObjects/mmi-mainMenu-page.ts b/test/e2e/mmi/pageObjects/mmi-mainMenu-page.ts
index 6c7027e02350..af93c7f5b56e 100644
--- a/test/e2e/mmi/pageObjects/mmi-mainMenu-page.ts
+++ b/test/e2e/mmi/pageObjects/mmi-mainMenu-page.ts
@@ -88,6 +88,17 @@ export class MMIMainMenuPage {
       .click();
   }
 
+  async fillPassword() {
+    await this.page.getByTestId('unlock-password').fill(process.env.MMI_E2E_MMI_PASSWORD as string);
+    await this.page.getByRole('button', { name: /unlock/iu }).click();
+  }
+
+  async finishOnboarding() {
+    await this.page.getByRole('button', { name: /continue/iu }).click();
+    await this.page.getByRole('button', { name: /continue to wallet/iu }).click();
+  }
+
+
   async switchTestNetwork() {
     await this.page
       .locator(
diff --git a/test/e2e/mmi/pageObjects/mmi-network-page.ts b/test/e2e/mmi/pageObjects/mmi-network-page.ts
index d71047f04c05..1da268cdeb1f 100644
--- a/test/e2e/mmi/pageObjects/mmi-network-page.ts
+++ b/test/e2e/mmi/pageObjects/mmi-network-page.ts
@@ -32,6 +32,7 @@ export class MMINetworkPage {
   }
 
   async selectNetwork(network: string) {
-    await this.page.getByText(network).first().click();
+    await this.page.waitForSelector(`text=${network}`, { state: 'visible' });
+    await this.page.click(`text=${network}`, { force: true });
   }
 }
diff --git a/test/e2e/mmi/pageObjects/mmi-signup-page.ts b/test/e2e/mmi/pageObjects/mmi-signup-page.ts
index 812e097a08a8..bf8615779e34 100644
--- a/test/e2e/mmi/pageObjects/mmi-signup-page.ts
+++ b/test/e2e/mmi/pageObjects/mmi-signup-page.ts
@@ -52,7 +52,7 @@ export class MMISignUpPage {
     this.agreePasswordTermsCheck = page.getByTestId('create-password-terms');
     this.importBtn = page.locator('button:has-text("Import my wallet")');
     this.doneBtn = page.locator('button:has-text("Done")');
-    this.gotItBtn = page.locator('button:has-text("Got it!")');
+    this.gotItBtn = page.locator('button:has-text("Got it")');
     this.nextBtn = page.locator('button:has-text("Next")');
   }
 
@@ -84,12 +84,6 @@ export class MMISignUpPage {
 
   async info() {
     await this.page.getByRole('button', { name: /continue/iu }).click();
-    await this.page
-      .getByRole('button', {
-        name: /continue metamask institutional onboarding/iu,
-      })
-      .click();
-    // After this click its redirect to the dashboard but we don't need to signin
   }
 
   async close() {
diff --git a/test/e2e/mmi/specs/extension.visual.spec.ts b/test/e2e/mmi/specs/extension.visual.spec.ts
index 0314877e89bd..240f3dce75b2 100644
--- a/test/e2e/mmi/specs/extension.visual.spec.ts
+++ b/test/e2e/mmi/specs/extension.visual.spec.ts
@@ -32,6 +32,8 @@ test.describe('MMI extension', () => {
     // Setup testnetwork in settings
     const mainMenuPage = new MMIMainMenuPage(page, extensionId as string);
     await mainMenuPage.goto();
+    await mainMenuPage.fillPassword();
+    await mainMenuPage.finishOnboarding();
     await mainMenuPage.selectMenuOption('settings');
     await mainMenuPage.selectSettings('Advance');
     await mainMenuPage.switchTestNetwork();
@@ -124,6 +126,8 @@ test.describe('MMI extension', () => {
     // Setup testnetwork in settings
     const mainMenuPage = new MMIMainMenuPage(page, extensionId as string);
     await mainMenuPage.goto();
+    await mainMenuPage.fillPassword();
+    await mainMenuPage.finishOnboarding();
     await mainMenuPage.selectMenuOption('settings');
     await mainMenuPage.selectSettings('Advance');
     await mainMenuPage.switchTestNetwork();
diff --git a/test/e2e/mmi/specs/navigation.spec.ts b/test/e2e/mmi/specs/navigation.spec.ts
index 6a04a794dd19..ee5d3e34503f 100644
--- a/test/e2e/mmi/specs/navigation.spec.ts
+++ b/test/e2e/mmi/specs/navigation.spec.ts
@@ -18,12 +18,10 @@ const supportContactUs =
   'https://mmi-support.metamask.io/hc/en-us/requests/new';
 const mmiHomePage = 'https://metamask.io/institutions/';
 const privacyAndPolicy = 'https://consensys.io/privacy-policy';
-const hwWalletPrivacyAndSecurity =
-  'https://support.metamask.io/hc/en-us/articles/4408552261275';
 const openSeaTermsOfUse = 'https://opensea.io/securityproviderterms';
 const metamaskAttributions = 'https://metamask.io/attributions/';
 const termsOfUse = 'https://consensys.io/terms-of-use';
-const learnMoreBlockaid = 'https://support.metamask.io/hc/en-us/articles/19878220833947-How-to-turn-on-Blockaid-security-alerts';
+const learnMoreArticles = 'https://support.metamask.io/hc/en-us/articles';
 
 test.describe('MMI Navigation', () => {
   test('MMI full navigation links', async ({ context }) => {
@@ -57,6 +55,8 @@ test.describe('MMI Navigation', () => {
       await getPageAndCloseRepeated(context, 'home.html'),
     );
 
+    await mainPage.finishOnboarding();
+
     // Check main page links
     await checkLinkURL(
       context,
@@ -122,7 +122,7 @@ test.describe('MMI Navigation', () => {
       context,
       mainMenuPage.page,
       'learn more',
-      hwWalletPrivacyAndSecurity,
+      'https://support.metamask.io',
     );
 
     await mainMenuPage.selectSettings('Security & privacy');
@@ -136,7 +136,7 @@ test.describe('MMI Navigation', () => {
       context,
       mainMenuPage.page,
       'requests. Learn more',
-      learnMoreBlockaid,
+      learnMoreArticles,
     );
 
     await mainMenuPage.selectSettings('Experimental');
diff --git a/test/e2e/mmi/specs/qrCode.spec.ts b/test/e2e/mmi/specs/qrCode.spec.ts
new file mode 100644
index 000000000000..5db3e97f6ecc
--- /dev/null
+++ b/test/e2e/mmi/specs/qrCode.spec.ts
@@ -0,0 +1,65 @@
+import { type Page, type BrowserContext } from '@playwright/test';
+import { test } from '../helpers/extension-loader';
+import { ChromeExtensionPage } from '../pageObjects/mmi-extension-page';
+import { MMIMainMenuPage } from '../pageObjects/mmi-mainMenu-page';
+import { MMINetworkPage } from '../pageObjects/mmi-network-page';
+import { MMISignUpPage } from '../pageObjects/mmi-signup-page';
+import { MMIMainPage } from '../pageObjects/mmi-main-page';
+import { MMIAccountMenuPage } from '../pageObjects/mmi-accountMenu-page';
+import { CustodianTestClient } from '../custodian-hooks/hooks';
+import { SEPOLIA_DISPLAY_NAME } from '../helpers/utils';
+
+test.describe('QR Code Connection Request', () => {
+  test('run the extension and add custodian accounts using the QR Code feature', async ({
+    page,
+    context,
+  }) => {
+    const client = new CustodianTestClient();
+    await client.setup();
+
+    // Getting extension id of MMI
+    const extensions = new ChromeExtensionPage(await context.newPage());
+    await extensions.goto();
+    await extensions.setDevMode();
+    const extensionId = await extensions.getExtensionId();
+    await extensions.close();
+
+    const signUp = new MMISignUpPage(
+      await context.newPage(),
+      extensionId as string,
+    );
+    await signUp.goto();
+    await signUp.start();
+    await signUp.authentication();
+    await signUp.info();
+    await signUp.close();
+
+    // Setup testnetwork in settings
+    const mainMenuPage = new MMIMainMenuPage(page, extensionId as string);
+    await mainMenuPage.goto();
+    await mainMenuPage.fillPassword();
+    await mainMenuPage.finishOnboarding();
+    await mainMenuPage.selectMenuOption('settings');
+    await mainMenuPage.selectSettings('Advance');
+    await mainMenuPage.switchTestNetwork();
+    await mainMenuPage.closeSettings();
+
+    // Check network
+    const networkPage = new MMINetworkPage(page);
+    await networkPage.open();
+    await networkPage.selectNetwork(
+      process.env.MMI_E2E_TEST_NETWORK || SEPOLIA_DISPLAY_NAME,
+    );
+
+    // Get account from and to name
+    const accountFrom = await client.getAccountFrom();
+
+    const accountsPopup = new MMIAccountMenuPage(page);
+    await accountsPopup.accountsMenu();
+    await accountsPopup.connectCustodian('Neptune Custody', false, true);
+    await accountsPopup.selectCustodyAccount(accountFrom);
+
+    const mainPage = new MMIMainPage(page);
+    await mainPage.bringToFront();
+  });
+});
diff --git a/test/e2e/mmi/specs/transactions.spec.ts b/test/e2e/mmi/specs/transactions.spec.ts
index 7ada08005851..b9b6b06cce99 100644
--- a/test/e2e/mmi/specs/transactions.spec.ts
+++ b/test/e2e/mmi/specs/transactions.spec.ts
@@ -13,6 +13,7 @@ const sendTransaction = async (
   page: Page,
   context: BrowserContext,
   client: CustodianTestClient,
+  repeatTx?: boolean,
 ) => {
   // Getting extension id of MMI
   const extensions = new ChromeExtensionPage(await context.newPage());
@@ -34,6 +35,8 @@ const sendTransaction = async (
   // Setup testnetwork in settings
   const mainMenuPage = new MMIMainMenuPage(page, extensionId as string);
   await mainMenuPage.goto();
+  await mainMenuPage.fillPassword();
+  await mainMenuPage.finishOnboarding();
   await mainMenuPage.selectMenuOption('settings');
   await mainMenuPage.selectSettings('Advance');
   await mainMenuPage.switchTestNetwork();
@@ -63,13 +66,26 @@ const sendTransaction = async (
   await mainPage.selectMainAction('Send');
   await mainPage.sendFunds(accounTo, '0');
 
+  if (repeatTx) {
+    await mainPage.bringToFront();
+    await mainPage.selectMainAction('Send');
+    await mainPage.sendFunds(accounTo, '0');
+  }
+
   // Check that action took place
   await mainPage.bringToFront();
   await mainPage.openActivityTab();
   await mainPage.checkLastTransactionStatus(/created/iu);
   // Get custodianTxId to mine the transaction
   const custodianTxId = await mainPage.getCustodianTXId();
-  return { mainPage, custodianTxId };
+
+  // Get the 2nd txId of the 2nd sent transaction
+  let secondCustodianTxId = '';
+  if (repeatTx) {
+    secondCustodianTxId = await mainPage.getSecondCustodianTXId();
+  }
+
+  return { mainPage, custodianTxId, secondCustodianTxId };
 };
 
 test.describe('MMI send', () => {
@@ -91,6 +107,31 @@ test.describe('MMI send', () => {
     await mainPage.checkLastTransactionStatus(statusName);
   });
 
+  test('Send a 2nd transaction while a there is already a pending transaction', async ({
+    page,
+    context,
+  }) => {
+    // Setup custodian and auth
+    const client = new CustodianTestClient();
+    await client.setup();
+    const repeatTx = true;
+    const { mainPage, custodianTxId, secondCustodianTxId } = await sendTransaction(
+      page,
+      context,
+      client,
+      repeatTx,
+    );
+
+    // Sign and submit
+    const statusName = await client.submitTransactionById(custodianTxId);
+    await mainPage.checkLastTransactionStatus(statusName);
+
+    if (secondCustodianTxId.length > 0) {
+      await client.submitTransactionById(secondCustodianTxId);
+    }
+  });
+
+
   test('Send a transaction from one account to another and abort it from custody', async ({
     page,
     context,
diff --git a/test/e2e/mmi/specs/visual.spec.ts b/test/e2e/mmi/specs/visual.spec.ts
index 5eb66affec92..8c2f8553de42 100644
--- a/test/e2e/mmi/specs/visual.spec.ts
+++ b/test/e2e/mmi/specs/visual.spec.ts
@@ -30,6 +30,8 @@ test.describe('MMI visual', () => {
     // Setup testnetwork in settings
     const mainMenuPage = new MMIMainMenuPage(page, extensionId as string);
     await mainMenuPage.goto();
+    await mainMenuPage.fillPassword();
+    await mainMenuPage.finishOnboarding();
     await mainMenuPage.selectMenuOption('settings');
     await mainMenuPage.selectSettings('Advance');
     await mainMenuPage.switchTestNetwork();
diff --git a/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-connection-info-mmi-visual-linux.png b/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-connection-info-mmi-visual-linux.png
index bc7cc8867ee3..7d58b39fc5a2 100644
Binary files a/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-connection-info-mmi-visual-linux.png and b/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-connection-info-mmi-visual-linux.png differ
diff --git a/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-list-mmi-visual-linux.png b/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-list-mmi-visual-linux.png
index fa3f4b7ab9c5..3725a09c80e1 100644
Binary files a/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-list-mmi-visual-linux.png and b/test/e2e/mmi/specs/visual.spec.ts-snapshots/custodian-list-mmi-visual-linux.png differ
diff --git a/test/e2e/mock-cdn/update-mock-cdn-files.js b/test/e2e/mock-cdn/update-mock-cdn-files.js
new file mode 100644
index 000000000000..12939760a2c2
--- /dev/null
+++ b/test/e2e/mock-cdn/update-mock-cdn-files.js
@@ -0,0 +1,127 @@
+const util = require('util');
+const { writeFileSync } = require('fs');
+
+const exec = util.promisify(require('node:child_process').exec);
+
+const PPOM_VERSION_URL =
+  'https://static.cx.metamask.io/api/v1/confirmations/ppom/ppom_version.json';
+const PPOM_CONFIG_URL =
+  'https://static.metafi.codefi.network/api/v1/confirmations/ppom/config/0x1/';
+const PPOM_STALE_URL =
+  'https://static.metafi.codefi.network/api/v1/confirmations/ppom/stale/0x1/';
+const PPOM_STALE_DIFF_URL =
+  'https://static.metafi.codefi.network/api/v1/confirmations/ppom/stale_diff/0x1/';
+const MOCK_CDN_FOLDER_URL = 'test/e2e/mock-cdn/';
+
+const CDN_CONFIG_PATH = 'test/e2e/mock-cdn/cdn-config.txt';
+const CDN_STALE_DIFF_PATH = 'test/e2e/mock-cdn/cdn-stale-diff.txt';
+const CDN_STALE_PATH = 'test/e2e/mock-cdn/cdn-stale.txt';
+
+async function getFileVersions() {
+  let ppomVersionData;
+
+  ppomVersionData = await fetch(PPOM_VERSION_URL, {
+    method: 'GET',
+  });
+
+  const ppomVersionDataHeaders = ppomVersionData.headers;
+  ppomVersionData = await ppomVersionData.json();
+
+  const etagVersion = ppomVersionDataHeaders.get('etag');
+  const etagVersionObject = { Etag: etagVersion };
+
+  // updating ppom-version-headers.json file
+  writeFileSync(
+    `${MOCK_CDN_FOLDER_URL}ppom-version-headers.json`,
+    JSON.stringify(etagVersionObject, null, 2),
+  );
+
+  // updating ppom-version.json file
+  writeFileSync(
+    `${MOCK_CDN_FOLDER_URL}ppom-version.json`,
+    JSON.stringify(ppomVersionData, null, 2),
+  );
+
+  const mainnetConfigVersion = ppomVersionData.find(
+    (item) => item.name === 'config' && item.chainId === '0x1',
+  ).version;
+
+  const mainnetStaleVersion = ppomVersionData.find(
+    (item) => item.name === 'stale' && item.chainId === '0x1',
+  ).version;
+
+  const mainnetStaleDiffVersion = ppomVersionData.find(
+    (item) => item.name === 'stale_diff' && item.chainId === '0x1',
+  ).version;
+
+  return {
+    mainnetConfigVersion,
+    mainnetStaleVersion,
+    mainnetStaleDiffVersion,
+  };
+}
+
+async function updateMockCdnFiles() {
+  const { mainnetConfigVersion, mainnetStaleVersion, mainnetStaleDiffVersion } =
+    await getFileVersions();
+
+  // updating cdn-config-res-headers.json file
+  const configResponse = await fetch(
+    `${PPOM_CONFIG_URL}${mainnetConfigVersion}`,
+    {
+      method: 'GET',
+    },
+  );
+
+  const configHeaders = configResponse.headers;
+
+  const etagConfig = configHeaders.get('etag');
+  const etagConfigObject = { Etag: etagConfig };
+
+  writeFileSync(
+    `${MOCK_CDN_FOLDER_URL}cdn-config-res-headers.json`,
+    JSON.stringify(etagConfigObject, null, 2),
+  );
+
+  // updating cdn-stale-res-headers.json file
+  const staleResponse = await fetch(`${PPOM_STALE_URL}${mainnetStaleVersion}`, {
+    method: 'GET',
+  });
+
+  const staleHeaders = staleResponse.headers;
+
+  const etagStale = staleHeaders.get('etag');
+  const etagStaleObject = { Etag: etagStale };
+
+  writeFileSync(
+    `${MOCK_CDN_FOLDER_URL}cdn-stale-res-headers.json`,
+    JSON.stringify(etagStaleObject, null, 2),
+  );
+
+  // updating cdn-stale-diff-res-headers.json file
+  const staleDiffResponse = await fetch(
+    `${PPOM_STALE_DIFF_URL}${mainnetStaleDiffVersion}`,
+    {
+      method: 'GET',
+    },
+  );
+
+  const staleDiffHeaders = staleDiffResponse.headers;
+
+  const etagStaleDiff = staleDiffHeaders.get('etag');
+  const etagStaleDiffObject = { Etag: etagStaleDiff };
+
+  writeFileSync(
+    `${MOCK_CDN_FOLDER_URL}cdn-stale-diff-res-headers.json`,
+    JSON.stringify(etagStaleDiffObject, null, 2),
+  );
+
+  // exporting the brotli data to files
+  exec(`curl ${PPOM_CONFIG_URL}${mainnetConfigVersion} -o ${CDN_CONFIG_PATH}`);
+  exec(`curl ${PPOM_STALE_URL}${mainnetStaleVersion} -o ${CDN_STALE_PATH}`);
+  exec(
+    `curl ${PPOM_STALE_DIFF_URL}${mainnetStaleDiffVersion} -o ${CDN_STALE_DIFF_PATH}`,
+  );
+}
+
+updateMockCdnFiles();
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index f3919e04e040..1a9ebad4c1f1 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -177,18 +177,60 @@ async function setupMocking(server, testSpecificMock, { chainId }) {
       };
     });
 
+  const gasPricesCallbackMock = () => ({
+    statusCode: 200,
+    json: {
+      SafeGasPrice: '1',
+      ProposeGasPrice: '2',
+      FastGasPrice: '3',
+    },
+  });
+  const suggestedGasFeesCallbackMock = () => ({
+    statusCode: 200,
+    json: {
+      low: {
+        suggestedMaxPriorityFeePerGas: '1',
+        suggestedMaxFeePerGas: '20.44436136',
+        minWaitTimeEstimate: 15000,
+        maxWaitTimeEstimate: 30000,
+      },
+      medium: {
+        suggestedMaxPriorityFeePerGas: '1.5',
+        suggestedMaxFeePerGas: '25.80554517',
+        minWaitTimeEstimate: 15000,
+        maxWaitTimeEstimate: 45000,
+      },
+      high: {
+        suggestedMaxPriorityFeePerGas: '2',
+        suggestedMaxFeePerGas: '27.277766977',
+        minWaitTimeEstimate: 15000,
+        maxWaitTimeEstimate: 60000,
+      },
+      estimatedBaseFee: '19.444436136',
+      networkCongestion: 0.14685,
+      latestPriorityFeeRange: ['0.378818859', '6.555563864'],
+      historicalPriorityFeeRange: ['0.1', '248.262969261'],
+      historicalBaseFeeRange: ['14.146999781', '28.825256275'],
+      priorityFeeTrend: 'down',
+      baseFeeTrend: 'up',
+    },
+  });
+
   await server
     .forGet(`${GAS_API_BASE_URL}/networks/${chainId}/gasPrices`)
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          SafeGasPrice: '1',
-          ProposeGasPrice: '2',
-          FastGasPrice: '3',
-        },
-      };
-    });
+    .thenCallback(gasPricesCallbackMock);
+
+  await server
+    .forGet(`${GAS_API_BASE_URL}/networks/1/gasPrices`)
+    .thenCallback(gasPricesCallbackMock);
+
+  await server
+    .forGet(`${GAS_API_BASE_URL}/networks/1/suggestedGasFees`)
+    .thenCallback(suggestedGasFeesCallbackMock);
+
+  await server
+    .forGet(`${GAS_API_BASE_URL}/networks/${chainId}/suggestedGasFees`)
+    .thenCallback(suggestedGasFeesCallbackMock);
 
   await server
     .forGet('https://swap.metaswap.codefi.network/networks/1/token')
@@ -207,41 +249,6 @@ async function setupMocking(server, testSpecificMock, { chainId }) {
       };
     });
 
-  await server
-    .forGet(`${GAS_API_BASE_URL}/networks/${chainId}/suggestedGasFees`)
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          low: {
-            suggestedMaxPriorityFeePerGas: '1',
-            suggestedMaxFeePerGas: '20.44436136',
-            minWaitTimeEstimate: 15000,
-            maxWaitTimeEstimate: 30000,
-          },
-          medium: {
-            suggestedMaxPriorityFeePerGas: '1.5',
-            suggestedMaxFeePerGas: '25.80554517',
-            minWaitTimeEstimate: 15000,
-            maxWaitTimeEstimate: 45000,
-          },
-          high: {
-            suggestedMaxPriorityFeePerGas: '2',
-            suggestedMaxFeePerGas: '27.277766977',
-            minWaitTimeEstimate: 15000,
-            maxWaitTimeEstimate: 60000,
-          },
-          estimatedBaseFee: '19.444436136',
-          networkCongestion: 0.14685,
-          latestPriorityFeeRange: ['0.378818859', '6.555563864'],
-          historicalPriorityFeeRange: ['0.1', '248.262969261'],
-          historicalBaseFeeRange: ['14.146999781', '28.825256275'],
-          priorityFeeTrend: 'down',
-          baseFeeTrend: 'up',
-        },
-      };
-    });
-
   await server
     .forGet('https://swap.metaswap.codefi.network/featureFlags')
     .thenCallback(() => {
diff --git a/test/e2e/mv3-perf-stats/bundle-size.js b/test/e2e/mv3-perf-stats/bundle-size.js
index 9c1f78b37be1..d37ec561bde5 100755
--- a/test/e2e/mv3-perf-stats/bundle-size.js
+++ b/test/e2e/mv3-perf-stats/bundle-size.js
@@ -17,17 +17,17 @@ const { exitWithError } = require('../../../development/lib/exit-with-error');
  */
 
 const backgroundFiles = [
-  'runtime-lavamoat.js',
-  'lockdown-more.js',
-  'sentry-install.js',
-  'policy-load.js',
+  'scripts/runtime-lavamoat.js',
+  'scripts/lockdown-more.js',
+  'scripts/sentry-install.js',
+  'scripts/policy-load.js',
 ];
 
 const uiFiles = [
-  'sentry-install.js',
-  'runtime-lavamoat.js',
-  'lockdown-more.js',
-  'policy-load.js',
+  'scripts/sentry-install.js',
+  'scripts/runtime-lavamoat.js',
+  'scripts/lockdown-more.js',
+  'scripts/policy-load.js',
 ];
 
 const BackgroundFileRegex = /background-[0-9]*.js/u;
diff --git a/test/e2e/restore/MetaMaskUserData.json b/test/e2e/restore/MetaMaskUserData.json
index 4ff35c60dcf6..0f400e8a34e7 100644
--- a/test/e2e/restore/MetaMaskUserData.json
+++ b/test/e2e/restore/MetaMaskUserData.json
@@ -36,11 +36,12 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true
     },
     "theme": "light",
     "useBlockie": false,
-    "useRequestQueue": false,
+    "useRequestQueue": true,
     "useNftDetection": false,
     "useNonceField": false,
     "usePhishDetect": true,
diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js
index c3cd39ec6ffc..0ff043261a7b 100644
--- a/test/e2e/run-all.js
+++ b/test/e2e/run-all.js
@@ -8,11 +8,7 @@ const { exitWithError } = require('../../development/lib/exit-with-error');
 const { loadBuildTypesConfig } = require('../../development/lib/build-type');
 
 // These tests should only be run on Flask for now.
-const FLASK_ONLY_TESTS = [
-  'test-snap-txinsights-v2.spec.js',
-  'test-snap-namelookup.spec.js',
-  'test-snap-siginsights.spec.js',
-];
+const FLASK_ONLY_TESTS = ['test-snap-namelookup.spec.js'];
 
 const getTestPathsForTestDir = async (testDir) => {
   const testFilenames = await fs.promises.readdir(testDir, {
@@ -80,7 +76,7 @@ async function main() {
             choices: ['chrome', 'firefox'],
           })
           .option('debug', {
-            default: process.env.E2E_DEBUG === 'true',
+            default: true,
             description:
               'Run tests in debug mode, logging each driver interaction',
             type: 'boolean',
@@ -192,8 +188,8 @@ async function main() {
   if (retries) {
     args.push('--retries', retries);
   }
-  if (debug) {
-    args.push('--debug');
+  if (!debug) {
+    args.push('--debug=false');
   }
   if (updateSnapshot) {
     args.push('--update-snapshot');
diff --git a/test/e2e/run-e2e-test.js b/test/e2e/run-e2e-test.js
index 93b436fd15da..a4c0496dbda6 100644
--- a/test/e2e/run-e2e-test.js
+++ b/test/e2e/run-e2e-test.js
@@ -14,13 +14,13 @@ async function main() {
       (_yargs) =>
         _yargs
           .option('browser', {
-            default: process.env.SELENIUM_BROWSER,
-            description: `Set the browser used; either 'chrome' or 'firefox'.`,
+            default: process.env.SELENIUM_BROWSER || 'all',
+            description: `Set the browser to be used; specify 'chrome', 'firefox', 'all' or leave unset to run on 'all' by default.`,
             type: 'string',
-            choices: ['chrome', 'firefox'],
+            choices: ['chrome', 'firefox', 'all'],
           })
           .option('debug', {
-            default: process.env.E2E_DEBUG === 'true',
+            default: true,
             description:
               'Run tests in debug mode, logging each driver interaction',
             type: 'boolean',
@@ -79,81 +79,105 @@ async function main() {
     updatePrivacySnapshot,
   } = argv;
 
-  if (!browser) {
-    exitWithError(
-      `"The browser must be set, via the '--browser' flag or the SELENIUM_BROWSER environment variable`,
-    );
-    return;
-  } else if (browser !== process.env.SELENIUM_BROWSER) {
-    process.env.SELENIUM_BROWSER = browser;
-  }
-
-  try {
-    const stat = await fs.stat(e2eTestPath);
-    if (!stat.isFile()) {
-      exitWithError('Test path must be a file');
-      return;
-    }
-  } catch (error) {
-    if (error.code === 'ENOENT') {
-      exitWithError('Test path specified does not exist');
-      return;
-    } else if (error.code === 'EACCES') {
+  const runTestsOnSingleBrowser = async (selectedBrowserForRun) => {
+    if (!selectedBrowserForRun) {
       exitWithError(
-        'Access to test path is forbidden by file access permissions',
+        `"The browser must be set, via the '--browser' flag or the SELENIUM_BROWSER environment variable`,
       );
       return;
+    } else if (selectedBrowserForRun !== process.env.SELENIUM_BROWSER) {
+      process.env.SELENIUM_BROWSER = selectedBrowserForRun;
+    }
+    try {
+      const stat = await fs.stat(e2eTestPath);
+      if (!stat.isFile()) {
+        exitWithError('Test path must be a file');
+        return;
+      }
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        exitWithError('Test path specified does not exist');
+        return;
+      } else if (error.code === 'EACCES') {
+        exitWithError(
+          'Access to test path is forbidden by file access permissions',
+        );
+        return;
+      }
+      throw error;
     }
-    throw error;
-  }
 
-  if (debug) {
-    process.env.E2E_DEBUG = 'true';
-  }
+    if (debug) {
+      process.env.E2E_DEBUG = 'true';
+    }
 
-  let testTimeoutInMilliseconds = 80 * 1000;
-  let exit = '--exit';
+    let testTimeoutInMilliseconds = 80 * 1000;
+    let exit = '--exit';
 
-  if (leaveRunning) {
-    process.env.E2E_LEAVE_RUNNING = 'true';
-    testTimeoutInMilliseconds = 0;
-    exit = '--no-exit';
-  }
+    if (leaveRunning) {
+      process.env.E2E_LEAVE_RUNNING = 'true';
+      testTimeoutInMilliseconds = 0;
+      exit = '--no-exit';
+    }
 
-  if (updateSnapshot) {
-    process.env.UPDATE_SNAPSHOTS = 'true';
-  }
+    if (updateSnapshot) {
+      process.env.UPDATE_SNAPSHOTS = 'true';
+    }
 
-  if (updatePrivacySnapshot) {
-    process.env.UPDATE_PRIVACY_SNAPSHOT = 'true';
-  }
+    if (updatePrivacySnapshot) {
+      process.env.UPDATE_PRIVACY_SNAPSHOT = 'true';
+    }
 
-  const configFile = path.join(__dirname, '.mocharc.js');
-  const extraArgs = process.env.E2E_ARGS?.split(' ') || [];
+    const configFile = path.join(__dirname, '.mocharc.js');
+    const extraArgs = process.env.E2E_ARGS?.split(' ') || [];
 
-  // If mmi flag is passed
-  if (mmi) {
-    // Tests that contains `@no-mmi` will be grep (-g) and inverted (-i)
-    // meaning that all tests with @no-mmi in the title will be ignored
-    extraArgs.push('-g', '@no-mmi', '-i');
-  }
+    // If mmi flag is passed
+    if (mmi) {
+      // Tests that contains `@no-mmi` will be grep (-g) and inverted (-i)
+      // meaning that all tests with @no-mmi in the title will be ignored
+      extraArgs.push('-g', '@no-mmi', '-i');
+    }
+
+    const dir = 'test/test-results/e2e';
+    fs.mkdir(dir, { recursive: true });
 
-  const dir = 'test/test-results/e2e';
-  fs.mkdir(dir, { recursive: true });
+    await retry({ retries, retryUntilFailure }, async () => {
+      await runInShell('yarn', [
+        'mocha',
+        `--config=${configFile}`,
+        `--timeout=${testTimeoutInMilliseconds}`,
+        '--reporter=mocha-junit-reporter',
+        '--reporter-options',
+        `mochaFile=test/test-results/e2e/[hash].xml,toConsole=true`,
+        ...extraArgs,
+        e2eTestPath,
+        exit,
+      ]);
+    });
+  };
 
-  await retry({ retries, retryUntilFailure }, async () => {
-    await runInShell('yarn', [
-      'mocha',
-      `--config=${configFile}`,
-      `--timeout=${testTimeoutInMilliseconds}`,
-      '--reporter=mocha-junit-reporter',
-      '--reporter-options',
-      `mochaFile=test/test-results/e2e/[hash].xml,toConsole=true`,
-      ...extraArgs,
-      e2eTestPath,
-      exit,
-    ]);
-  });
+  const allBrowsers = ['chrome', 'firefox'];
+  if (browser === 'all') {
+    for (const currentBrowser of allBrowsers) {
+      console.log(`Running tests on ${currentBrowser}`);
+      try {
+        await runTestsOnSingleBrowser(currentBrowser);
+      } catch (error) {
+        exitWithError(
+          `Error occurred while running tests on ${currentBrowser}: ${error}`,
+        );
+      }
+    }
+  } else {
+    console.log(`Running tests on ${browser}`);
+    try {
+      await runTestsOnSingleBrowser(browser);
+    } catch (error) {
+      exitWithError(
+        `Error occurred while running tests on ${browser}: ${error}`,
+      );
+    }
+  }
 }
 
 main().catch((error) => {
diff --git a/test/e2e/ganache.ts b/test/e2e/seeder/ganache.ts
similarity index 100%
rename from test/e2e/ganache.ts
rename to test/e2e/seeder/ganache.ts
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
index 3aa3b801b09d..5732b1b7f335 100644
--- a/test/e2e/snaps/enums.js
+++ b/test/e2e/snaps/enums.js
@@ -1,3 +1,3 @@
 module.exports = {
-  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.4.0/',
+  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.6.1/',
 };
diff --git a/test/e2e/snaps/test-snap-bip-32.spec.js b/test/e2e/snaps/test-snap-bip-32.spec.js
index 6a28418cd9ea..59a9c14833e8 100644
--- a/test/e2e/snaps/test-snap-bip-32.spec.js
+++ b/test/e2e/snaps/test-snap-bip-32.spec.js
@@ -45,22 +45,24 @@ describe('Test Snap bip-32', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
         // wait for permissions popover, click checkboxes and confirm
         await driver.waitForSelector('.mm-checkbox__input');
         await driver.clickElement('.mm-checkbox__input');
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
+        await driver.waitForSelector(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
+        await driver.clickElement(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
 
         await driver.waitForSelector({ text: 'OK' });
         await driver.clickElement({
diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js
index ef966610d384..ef70e6fc193a 100644
--- a/test/e2e/snaps/test-snap-bip-44.spec.js
+++ b/test/e2e/snaps/test-snap-bip-44.spec.js
@@ -40,22 +40,26 @@ describe('Test Snap bip-44', function () {
           text: 'Connect',
           tag: 'button',
         });
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
         // deal with permissions popover
         await driver.waitForSelector('.mm-checkbox__input');
         await driver.clickElement('.mm-checkbox__input');
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
+        await driver.waitForSelector(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
+        await driver.clickElement(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
+
+        // deal with OK button
         await driver.waitForSelector({ text: 'OK' });
         await driver.clickElement({
           text: 'OK',
diff --git a/test/e2e/snaps/test-snap-clientstatus.spec.js b/test/e2e/snaps/test-snap-clientstatus.spec.js
index aa125579c456..e6d142d38b82 100644
--- a/test/e2e/snaps/test-snap-clientstatus.spec.js
+++ b/test/e2e/snaps/test-snap-clientstatus.spec.js
@@ -49,10 +49,10 @@ describe('Test Snap Client Status', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-cronjob.spec.js b/test/e2e/snaps/test-snap-cronjob.spec.js
index 20ba94165b9b..a7f29b2eb417 100644
--- a/test/e2e/snaps/test-snap-cronjob.spec.js
+++ b/test/e2e/snaps/test-snap-cronjob.spec.js
@@ -47,10 +47,10 @@ describe('Test Snap Cronjob', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-dialog.spec.js b/test/e2e/snaps/test-snap-dialog.spec.js
index e6d3673a1585..de2076bf2110 100644
--- a/test/e2e/snaps/test-snap-dialog.spec.js
+++ b/test/e2e/snaps/test-snap-dialog.spec.js
@@ -47,10 +47,10 @@ describe('Test Snap Dialog', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-ethprovider.spec.js b/test/e2e/snaps/test-snap-ethprovider.spec.js
index 644397931ba0..dcc44ce10898 100644
--- a/test/e2e/snaps/test-snap-ethprovider.spec.js
+++ b/test/e2e/snaps/test-snap-ethprovider.spec.js
@@ -49,10 +49,10 @@ describe('Test Snap ethereum_provider', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -107,11 +107,11 @@ describe('Test Snap ethereum_provider', function () {
           tag: 'button',
         });
         await driver.waitForSelector({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-get-file.spec.js b/test/e2e/snaps/test-snap-get-file.spec.js
index 0c8795d7a654..72cb4de45b99 100644
--- a/test/e2e/snaps/test-snap-get-file.spec.js
+++ b/test/e2e/snaps/test-snap-get-file.spec.js
@@ -47,10 +47,10 @@ describe('Test Snap Get File', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-get-locale.spec.js b/test/e2e/snaps/test-snap-get-locale.spec.js
index aeff38abd975..b300115e6765 100644
--- a/test/e2e/snaps/test-snap-get-locale.spec.js
+++ b/test/e2e/snaps/test-snap-get-locale.spec.js
@@ -47,12 +47,18 @@ describe('Test Snap Get Locale', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        // look for the snap name
+        await driver.waitForSelector({
+          text: 'Localization Example Snap',
+          tag: 'p',
+        });
+
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -115,6 +121,20 @@ describe('Test Snap Get Locale', function () {
         // try to select dansk from the list
         await driver.clickElement({ text: 'Dansk', tag: 'option' });
 
+        // click on the global action menu
+        await driver.waitForSelector(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+
+        // try to click on snaps
+        await driver.clickElement({ text: 'Snaps', tag: 'div' });
+
+        // check for localized snap title
+        await driver.waitForSelector({ text: 'Oversættelses Eksempel Snap' });
+
         // switch back to test snaps tab
         windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
diff --git a/test/e2e/snaps/test-snap-getentropy.spec.js b/test/e2e/snaps/test-snap-getentropy.spec.js
index 302afacaca06..0c7168420462 100644
--- a/test/e2e/snaps/test-snap-getentropy.spec.js
+++ b/test/e2e/snaps/test-snap-getentropy.spec.js
@@ -47,12 +47,12 @@ describe('Test Snap getEntropy', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-homepage.spec.js b/test/e2e/snaps/test-snap-homepage.spec.js
index bd714d218858..a31c17d5805b 100644
--- a/test/e2e/snaps/test-snap-homepage.spec.js
+++ b/test/e2e/snaps/test-snap-homepage.spec.js
@@ -48,10 +48,10 @@ describe('Test Snap Homepage', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-installed.spec.js b/test/e2e/snaps/test-snap-installed.spec.js
index 24932fd0d49d..405da98fbd07 100644
--- a/test/e2e/snaps/test-snap-installed.spec.js
+++ b/test/e2e/snaps/test-snap-installed.spec.js
@@ -81,10 +81,10 @@ describe('Test Snap Installed', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -109,7 +109,7 @@ describe('Test Snap Installed', function () {
         assert.deepStrictEqual(events[0].properties, {
           snap_id: 'npm:@metamask/dialog-example-snap',
           origin: 'https://metamask.github.io',
-          version: '2.2.0',
+          version: '2.2.1',
           category: 'Snaps',
           locale: 'en',
           chain_id: '0x539',
@@ -133,10 +133,10 @@ describe('Test Snap Installed', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-lifecycle.spec.js b/test/e2e/snaps/test-snap-lifecycle.spec.js
index e793fd769cec..c63ef1061dd9 100644
--- a/test/e2e/snaps/test-snap-lifecycle.spec.js
+++ b/test/e2e/snaps/test-snap-lifecycle.spec.js
@@ -47,10 +47,10 @@ describe('Test Snap Lifecycle Hooks', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-management.spec.js b/test/e2e/snaps/test-snap-management.spec.js
index 77089713bcc3..1fb1d2258c5f 100644
--- a/test/e2e/snaps/test-snap-management.spec.js
+++ b/test/e2e/snaps/test-snap-management.spec.js
@@ -48,10 +48,10 @@ describe('Test Snap Management', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js
index 5188ec001ab3..e7e35d5920ee 100644
--- a/test/e2e/snaps/test-snap-managestate.spec.js
+++ b/test/e2e/snaps/test-snap-managestate.spec.js
@@ -48,10 +48,10 @@ describe('Test Snap manageState', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-namelookup.spec.js b/test/e2e/snaps/test-snap-namelookup.spec.js
index 55dccf602d8e..c092f44d1f92 100644
--- a/test/e2e/snaps/test-snap-namelookup.spec.js
+++ b/test/e2e/snaps/test-snap-namelookup.spec.js
@@ -16,7 +16,6 @@ describe('Test Snap Name Lookup', function () {
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
-        await driver.navigate();
         await unlockWallet(driver);
 
         // navigate to test snaps page and connect
@@ -49,10 +48,10 @@ describe('Test Snap Name Lookup', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-networkaccess.spec.js b/test/e2e/snaps/test-snap-networkaccess.spec.js
index 57a036f50532..c3159dddedeb 100644
--- a/test/e2e/snaps/test-snap-networkaccess.spec.js
+++ b/test/e2e/snaps/test-snap-networkaccess.spec.js
@@ -47,10 +47,10 @@ describe('Test Snap networkAccess', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js
index a6a02f442359..f3eb45da1033 100644
--- a/test/e2e/snaps/test-snap-notification.spec.js
+++ b/test/e2e/snaps/test-snap-notification.spec.js
@@ -49,10 +49,10 @@ describe('Test Snap Notification', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-revoke-perm.spec.js b/test/e2e/snaps/test-snap-revoke-perm.spec.js
index c6ea20aa4a99..b70cc3ab4cc1 100644
--- a/test/e2e/snaps/test-snap-revoke-perm.spec.js
+++ b/test/e2e/snaps/test-snap-revoke-perm.spec.js
@@ -42,10 +42,10 @@ describe('Test Snap revoke permission', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -81,7 +81,7 @@ describe('Test Snap revoke permission', function () {
         });
         await driver.delay(500);
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -146,7 +146,7 @@ describe('Test Snap revoke permission', function () {
         });
         await driver.delay(500);
         await driver.clickElement({
-          text: 'Connect',
+          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 a5dcac9fb562..8024ad0cf0a4 100644
--- a/test/e2e/snaps/test-snap-rpc.spec.js
+++ b/test/e2e/snaps/test-snap-rpc.spec.js
@@ -40,23 +40,26 @@ describe('Test Snap RPC', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
         // wait for permissions popover, click checkboxes and confirm
         await driver.waitForSelector('.mm-checkbox__input');
         await driver.clickElement('.mm-checkbox__input');
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
-
+        await driver.waitForSelector(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
+        await driver.clickElement(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
+
+        // deal with OK button
         await driver.waitForSelector({ text: 'OK' });
 
         await driver.clickElement({
@@ -78,10 +81,10 @@ describe('Test Snap RPC', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-siginsights.spec.js b/test/e2e/snaps/test-snap-siginsights.spec.js
index cb04d15e0ba2..87911fd7cc1f 100644
--- a/test/e2e/snaps/test-snap-siginsights.spec.js
+++ b/test/e2e/snaps/test-snap-siginsights.spec.js
@@ -19,7 +19,6 @@ describe('Test Snap Signature Insights', function () {
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
-        await driver.navigate();
         await unlockWallet(driver);
 
         // navigate to test snaps page and connect
@@ -50,10 +49,10 @@ describe('Test Snap Signature Insights', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -77,16 +76,6 @@ describe('Test Snap Signature Insights', function () {
           windowHandles,
         );
 
-        // wait for and click use flask
-        await driver.waitForSelector({
-          text: 'Use MetaMask Flask',
-          tag: 'button',
-        });
-        await driver.clickElement({
-          text: 'Use MetaMask Flask',
-          tag: 'button',
-        });
-
         // find and scroll to basic actions and click connect
         const connectButton1 = await driver.findElement('#connectButton');
         await driver.scrollToElement(connectButton1);
@@ -104,7 +93,7 @@ describe('Test Snap Signature Insights', function () {
         });
         await driver.delay(1000);
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-txinsights-v2.spec.js b/test/e2e/snaps/test-snap-txinsights-v2.spec.js
index de8b9a148e1c..72f766c20120 100644
--- a/test/e2e/snaps/test-snap-txinsights-v2.spec.js
+++ b/test/e2e/snaps/test-snap-txinsights-v2.spec.js
@@ -16,7 +16,6 @@ describe('Test Snap TxInsights-v2', function () {
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
-        await driver.navigate();
         await unlockWallet(driver);
 
         // navigate to test snaps page and connect
@@ -51,10 +50,10 @@ describe('Test Snap TxInsights-v2', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -80,11 +79,11 @@ describe('Test Snap TxInsights-v2', function () {
           tag: 'button',
         });
         await driver.waitForSelector({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-txinsights.spec.js b/test/e2e/snaps/test-snap-txinsights.spec.js
index 2442274e8d61..7987e0b86c70 100644
--- a/test/e2e/snaps/test-snap-txinsights.spec.js
+++ b/test/e2e/snaps/test-snap-txinsights.spec.js
@@ -50,10 +50,10 @@ describe('Test Snap TxInsights', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -79,11 +79,11 @@ describe('Test Snap TxInsights', function () {
           tag: 'button',
         });
         await driver.waitForSelector({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-ui-imgs.spec.js b/test/e2e/snaps/test-snap-ui-imgs.spec.js
new file mode 100644
index 000000000000..d8bb8af1e1d8
--- /dev/null
+++ b/test/e2e/snaps/test-snap-ui-imgs.spec.js
@@ -0,0 +1,101 @@
+const {
+  defaultGanacheOptions,
+  withFixtures,
+  unlockWallet,
+  switchToNotificationWindow,
+  WINDOW_TITLES,
+} = require('../helpers');
+const FixtureBuilder = require('../fixture-builder');
+const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
+
+describe('Test Snap Images', function () {
+  it('can display images in snap ui', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // navigate to test snaps page and connect
+        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
+
+        // wait for page to load
+        await driver.waitForSelector({
+          text: 'Installed Snaps',
+          tag: 'h2',
+        });
+
+        // find and scroll to the images test and connect
+        const snapButton1 = await driver.findElement('#connectimages');
+        await driver.scrollToElement(snapButton1);
+        await driver.delay(1000);
+        await driver.waitForSelector('#connectimages');
+        await driver.clickElement('#connectimages');
+
+        // switch to metamask extension and click connect and approve
+        await switchToNotificationWindow(driver, 2);
+        await driver.clickElement({
+          text: 'Connect',
+          tag: 'button',
+        });
+        await driver.waitForSelector({ text: 'Confirm' });
+
+        await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+        });
+
+        // deal with OK button
+        await driver.waitForSelector({ text: 'OK' });
+        await driver.clickElement({
+          text: 'OK',
+          tag: 'button',
+        });
+
+        // switch back to test-snaps window
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
+
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectimages',
+          text: 'Reconnect to Images Snap',
+        });
+
+        // find and click svg image test
+        await driver.clickElement('#showSVGImage');
+
+        // switch to notification window
+        await switchToNotificationWindow(driver, 2);
+
+        // check snaps ui image using waitForSelector
+        await driver.waitForSelector('[data-testid="snaps-ui-image"]');
+
+        // click ok to close window
+        await driver.clickElement('[data-testid="confirmation-submit-button"]');
+
+        // switch back to test-snaps window
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
+
+        // find and click cat image test
+        await driver.clickElement('#showPNGImage');
+
+        // switch to notification window
+        await switchToNotificationWindow(driver, 2);
+
+        // check snaps ui image using waitForSelector
+        await driver.waitForSelector('[data-testid="snaps-ui-image"]');
+
+        // click ok to close window
+        await driver.clickElement('[data-testid="confirmation-submit-button"]');
+
+        // switch back to test-snaps window
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
+      },
+    );
+  });
+});
diff --git a/test/e2e/snaps/test-snap-uilinks.spec.js b/test/e2e/snaps/test-snap-uilinks.spec.js
new file mode 100644
index 000000000000..dcea6f9ffe92
--- /dev/null
+++ b/test/e2e/snaps/test-snap-uilinks.spec.js
@@ -0,0 +1,149 @@
+const {
+  defaultGanacheOptions,
+  withFixtures,
+  unlockWallet,
+  WINDOW_TITLES,
+} = require('../helpers');
+const FixtureBuilder = require('../fixture-builder');
+const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
+
+describe('Test Snap UI Links', function () {
+  it('test link in confirmation snap_dialog type', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        failOnConsoleError: false,
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // navigate to test snaps page and connect to dialog snap
+        await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
+        await driver.delay(1000);
+        const dialogButton = await driver.findElement('#connectdialogs');
+        await driver.scrollToElement(dialogButton);
+        await driver.delay(1000);
+        await driver.clickElement('#connectdialogs');
+        await driver.delay(1000);
+
+        // switch to metamask extension and click connect
+        let windowHandles = await driver.waitUntilXWindowHandles(
+          3,
+          1000,
+          10000,
+        );
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.Dialog,
+          windowHandles,
+        );
+        await driver.clickElement({
+          text: 'Connect',
+          tag: 'button',
+        });
+
+        await driver.waitForSelector({ text: 'Confirm' });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          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);
+
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectdialogs',
+          text: 'Reconnect to Dialogs Snap',
+        });
+
+        // click conf button
+        await driver.clickElement('#sendConfirmationButton');
+        await driver.delay(500);
+
+        // switch to dialog popup
+        windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.Dialog,
+          windowHandles,
+        );
+        await driver.delay(500);
+
+        // wait for link to appear and click it
+        await driver.waitForSelector({
+          text: 'That',
+          tag: 'span',
+        });
+        await driver.clickElement({
+          text: 'That',
+          tag: 'span',
+        });
+
+        // wait for the link to be provided
+        await driver.waitForSelector({
+          text: 'snaps.metamask.io',
+          tag: 'b',
+        });
+
+        // wait for and click visit site button
+        await driver.waitForSelector({
+          text: 'Visit site',
+          tag: 'a',
+        });
+        await driver.clickElement({
+          text: 'Visit site',
+          tag: 'a',
+        });
+
+        // switch to new tab
+        windowHandles = await driver.waitUntilXWindowHandles(4, 1000, 10000);
+        await driver.switchToWindowWithTitle(
+          'MetaMask Snaps Directory',
+          windowHandles,
+        );
+
+        // check that the correct page has been opened
+        await driver.waitForSelector({
+          text: 'Most Popular',
+          tag: 'h2',
+        });
+
+        // switch back to metamask window
+        windowHandles = await driver.waitUntilXWindowHandles(4, 1000, 10000);
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.Dialog,
+          windowHandles,
+        );
+
+        // wait for and click approve button
+        await driver.waitForSelector({
+          text: 'Approve',
+          tag: 'button',
+        });
+        await driver.clickElement({
+          text: 'Approve',
+          tag: 'button',
+        });
+
+        // switch back to test snaps tab
+        windowHandles = await driver.waitUntilXWindowHandles(4, 1000, 10000);
+        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+
+        // check for false result
+        await driver.waitForSelector({
+          css: '#dialogResult',
+          text: 'true',
+        });
+      },
+    );
+  });
+});
diff --git a/test/e2e/snaps/test-snap-update-component.spec.js b/test/e2e/snaps/test-snap-update-component.spec.js
index 221c1f153609..cd440d605f65 100644
--- a/test/e2e/snaps/test-snap-update-component.spec.js
+++ b/test/e2e/snaps/test-snap-update-component.spec.js
@@ -48,23 +48,26 @@ describe('Test Snap update via snaps component', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
         // wait for permissions popover, click checkboxes and confirm
         await driver.waitForSelector('.mm-checkbox__input');
         await driver.clickElement('.mm-checkbox__input');
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
+        await driver.waitForSelector(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
+        await driver.clickElement(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
 
+        // deal with OK button
         await driver.waitForSelector({ text: 'OK' });
 
         await driver.clickElement({
@@ -127,7 +130,7 @@ describe('Test Snap update via snaps component', function () {
         await driver.clickElementSafe('[data-testid="snap-update-scroll"]');
 
         await driver.clickElement({
-          text: 'Update',
+          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 cbf174624474..fa78dba5c5b2 100644
--- a/test/e2e/snaps/test-snap-update.spec.js
+++ b/test/e2e/snaps/test-snap-update.spec.js
@@ -40,23 +40,26 @@ describe('Test Snap update', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElementSafe('[data-testid="snap-install-scroll"]');
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
         // wait for permissions popover, click checkboxes and confirm
         await driver.delay(500);
         await driver.clickElement('.mm-checkbox__input');
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
+        await driver.waitForSelector(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
+        await driver.clickElement(
+          '[data-testid="snap-install-warning-modal-confirm"]',
+        );
 
+        // deal with OK button
         await driver.waitForSelector({ text: 'OK' });
 
         await driver.clickElement({
@@ -92,7 +95,7 @@ describe('Test Snap update', function () {
         await driver.clickElementSafe('[data-testid="snap-update-scroll"]');
 
         await driver.clickElement({
-          text: 'Update',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/snaps/test-snap-wasm.spec.js b/test/e2e/snaps/test-snap-wasm.spec.js
index 2f63e7414cb7..0545cd2479ef 100644
--- a/test/e2e/snaps/test-snap-wasm.spec.js
+++ b/test/e2e/snaps/test-snap-wasm.spec.js
@@ -48,10 +48,10 @@ describe('Test Snap WASM', function () {
           tag: 'button',
         });
 
-        await driver.waitForSelector({ text: 'Install' });
+        await driver.waitForSelector({ text: 'Confirm' });
 
         await driver.clickElement({
-          text: 'Install',
+          text: 'Confirm',
           tag: 'button',
         });
 
diff --git a/test/e2e/tests/account-menu/account-details.spec.js b/test/e2e/tests/account/account-details.spec.js
similarity index 100%
rename from test/e2e/tests/account-menu/account-details.spec.js
rename to test/e2e/tests/account/account-details.spec.js
diff --git a/test/e2e/tests/account-menu/account-hide-unhide.spec.js b/test/e2e/tests/account/account-hide-unhide.spec.js
similarity index 100%
rename from test/e2e/tests/account-menu/account-hide-unhide.spec.js
rename to test/e2e/tests/account/account-hide-unhide.spec.js
diff --git a/test/e2e/tests/account-menu/account-pin-unpin.spec.js b/test/e2e/tests/account/account-pin-unpin.spec.js
similarity index 100%
rename from test/e2e/tests/account-menu/account-pin-unpin.spec.js
rename to test/e2e/tests/account/account-pin-unpin.spec.js
diff --git a/test/e2e/tests/account-menu/add-account.spec.js b/test/e2e/tests/account/add-account.spec.js
similarity index 99%
rename from test/e2e/tests/account-menu/add-account.spec.js
rename to test/e2e/tests/account/add-account.spec.js
index cc456bb381a7..c0bc6fc78e13 100644
--- a/test/e2e/tests/account-menu/add-account.spec.js
+++ b/test/e2e/tests/account/add-account.spec.js
@@ -130,11 +130,9 @@ describe('Add account', function () {
 
         // Land in 1st account home page
         await driver.findElement('.home__main-view');
-
         if (!process.env.MULTICHAIN) {
           await waitForAccountRendered(driver);
         }
-
         // Check address of 1st account
         await driver.findElement('[data-testid="app-header-copy-button"]');
 
diff --git a/test/e2e/tests/account-menu/import-flow.spec.js b/test/e2e/tests/account/import-flow.spec.js
similarity index 100%
rename from test/e2e/tests/account-menu/import-flow.spec.js
rename to test/e2e/tests/account/import-flow.spec.js
diff --git a/test/e2e/tests/incremental-security.spec.js b/test/e2e/tests/account/incremental-security.spec.js
similarity index 98%
rename from test/e2e/tests/incremental-security.spec.js
rename to test/e2e/tests/account/incremental-security.spec.js
index 857cd79e3e8d..bdbde3b26101 100644
--- a/test/e2e/tests/incremental-security.spec.js
+++ b/test/e2e/tests/account/incremental-security.spec.js
@@ -1,6 +1,6 @@
 const { strict: assert } = require('assert');
-const { convertToHexValue, withFixtures, openDapp } = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+const { convertToHexValue, withFixtures, openDapp } = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 const WALLET_PASSWORD = 'correct horse battery staple';
 
diff --git a/test/e2e/tests/lock-account.spec.js b/test/e2e/tests/account/lock-account.spec.js
similarity index 92%
rename from test/e2e/tests/lock-account.spec.js
rename to test/e2e/tests/account/lock-account.spec.js
index a4d23ab7838f..d384ff0020ae 100644
--- a/test/e2e/tests/lock-account.spec.js
+++ b/test/e2e/tests/account/lock-account.spec.js
@@ -3,8 +3,8 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Lock and unlock', function () {
   it('successfully unlocks after lock', async function () {
diff --git a/test/e2e/tests/lockdown.spec.js b/test/e2e/tests/account/lockdown.spec.js
similarity index 90%
rename from test/e2e/tests/lockdown.spec.js
rename to test/e2e/tests/account/lockdown.spec.js
index 988463bc13ae..bb221f55c59f 100644
--- a/test/e2e/tests/lockdown.spec.js
+++ b/test/e2e/tests/account/lockdown.spec.js
@@ -3,10 +3,10 @@ const { Browser } = require('selenium-webdriver');
 const {
   getGlobalProperties,
   testIntrinsic,
-} = require('../../helpers/protect-intrinsics-helpers');
-const { convertToHexValue, withFixtures } = require('../helpers');
-const { PAGES } = require('../webdriver/driver');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../../helpers/protect-intrinsics-helpers');
+const { convertToHexValue, withFixtures } = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+const FixtureBuilder = require('../../fixture-builder');
 
 const isFirefox = process.env.SELENIUM_BROWSER === Browser.FIREFOX;
 
diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/account/metamask-responsive-ui.spec.js
similarity index 98%
rename from test/e2e/tests/metamask-responsive-ui.spec.js
rename to test/e2e/tests/account/metamask-responsive-ui.spec.js
index 7f80c8380284..fc51eac7c3d4 100644
--- a/test/e2e/tests/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/account/metamask-responsive-ui.spec.js
@@ -6,8 +6,8 @@ const {
   locateAccountBalanceDOM,
   openActionMenuAndStartSendFlow,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('MetaMask Responsive UI', function () {
   it('Creating a new wallet @no-mmi', async function () {
diff --git a/test/e2e/tests/migrate-old-vault.spec.js b/test/e2e/tests/account/migrate-old-vault.spec.js
similarity index 89%
rename from test/e2e/tests/migrate-old-vault.spec.js
rename to test/e2e/tests/account/migrate-old-vault.spec.js
index 93bd07010bbe..610a2afebec3 100644
--- a/test/e2e/tests/migrate-old-vault.spec.js
+++ b/test/e2e/tests/account/migrate-old-vault.spec.js
@@ -1,6 +1,6 @@
 const { strict: assert } = require('assert');
-const { defaultGanacheOptions, withFixtures } = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+const { defaultGanacheOptions, withFixtures } = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 const lock = async (driver) => {
   await driver.clickElement('[data-testid="account-options-menu-button"]');
diff --git a/test/e2e/tests/confirmations/header.spec.js b/test/e2e/tests/confirmations/header.spec.js
new file mode 100644
index 000000000000..c829958f8b5e
--- /dev/null
+++ b/test/e2e/tests/confirmations/header.spec.js
@@ -0,0 +1,112 @@
+const { strict: assert } = require('assert');
+const {
+  defaultGanacheOptions,
+  openDapp,
+  unlockWallet,
+  WINDOW_TITLES,
+  withFixtures,
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+
+const SIGNATURE_CONFIRMATIONS = [
+  { name: 'Personal Sign signature', testDAppBtnId: 'personalSign' },
+  { name: 'Sign Typed Data signature', testDAppBtnId: 'signTypedData' },
+  { name: 'Sign Typed Data v3 signature', testDAppBtnId: 'signTypedDataV3' },
+  { name: 'Sign Typed Data v4 signature', testDAppBtnId: 'signTypedDataV4' },
+  { name: 'Sign Permit signature', testDAppBtnId: 'signPermit' },
+];
+
+const WALLET_ADDRESS = '0x5CfE73b6021E818B776b421B1c4Db2474086a7e1';
+const WALLET_ETH_BALANCE = '25';
+
+describe('Confirmation Header Component', function () {
+  SIGNATURE_CONFIRMATIONS.forEach((confirmation) => {
+    it(`${confirmation.name} component includes header with balance`, async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withPreferencesController({
+              preferences: { redesignedConfirmationsEnabled: true },
+            })
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test?.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+
+          await clickConfirmationBtnOnTestDapp(
+            driver,
+            confirmation.testDAppBtnId,
+          );
+          await clickHeaderInfoBtn(driver);
+
+          await assertHeaderInfoBalance(driver, WALLET_ETH_BALANCE);
+        },
+      );
+    });
+
+    it(`${confirmation.name} component includes copyable address element`, async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withPreferencesController({
+              preferences: { redesignedConfirmationsEnabled: true },
+            })
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test?.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+
+          await clickConfirmationBtnOnTestDapp(
+            driver,
+            confirmation.testDAppBtnId,
+          );
+          await clickHeaderInfoBtn(driver);
+          await copyAddressAndPasteWalletAddress(driver);
+
+          await assertPastedAddress(driver, WALLET_ADDRESS);
+        },
+      );
+    });
+
+    async function clickConfirmationBtnOnTestDapp(driver, btnId) {
+      await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+      await driver.clickElement(`#${btnId}`);
+      await driver.delay(2000);
+    }
+
+    async function clickHeaderInfoBtn(driver) {
+      await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+      await driver.clickElement('button[data-testid="header-info-button"]');
+    }
+
+    async function assertHeaderInfoBalance(driver, walletEthBalance) {
+      const headerBalanceEl = await driver.findElement(
+        '[data-testid="header-balance"]',
+      );
+      await driver.waitForNonEmptyElement(headerBalanceEl);
+      assert.equal(await headerBalanceEl.getText(), `${walletEthBalance}\nETH`);
+    }
+
+    async function copyAddressAndPasteWalletAddress(driver) {
+      await driver.clickElement('[data-testid="address-copy-button-text"]');
+      await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+      await driver.findElement('#eip747ContractAddress');
+      await driver.pasteFromClipboardIntoField('#eip747ContractAddress');
+    }
+
+    async function assertPastedAddress(driver, walletAddress) {
+      const formFieldEl = await driver.findElement('#eip747ContractAddress');
+      assert.equal(await formFieldEl.getProperty('value'), walletAddress);
+    }
+  });
+});
diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/dapp-interactions/contract-interactions.spec.js
similarity index 95%
rename from test/e2e/tests/contract-interactions.spec.js
rename to test/e2e/tests/dapp-interactions/contract-interactions.spec.js
index d59ece2d97ed..a6ebe01575c8 100644
--- a/test/e2e/tests/contract-interactions.spec.js
+++ b/test/e2e/tests/dapp-interactions/contract-interactions.spec.js
@@ -6,10 +6,10 @@ const {
   largeDelayMs,
   WINDOW_TITLES,
   locateAccountBalanceDOM,
-} = require('../helpers');
+} = require('../../helpers');
 
-const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
-const FixtureBuilder = require('../fixture-builder');
+const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Deploy contract and call contract methods', function () {
   const smartContract = SMART_CONTRACTS.PIGGYBANK;
diff --git a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
index 1181e5856ffd..77a9fca375de 100644
--- a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
+++ b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
@@ -3,7 +3,6 @@ const {
   defaultGanacheOptions,
   withFixtures,
   openDapp,
-  DAPP_URL,
   DAPP_ONE_URL,
   unlockWallet,
   WINDOW_TITLES,
@@ -18,7 +17,7 @@ describe('Dapp interactions', function () {
         dapp: true,
         fixtures: new FixtureBuilder().build(),
         ganacheOptions: generateGanacheOptions({
-          concurrent: { port: 8546, chainId: 1338 },
+          concurrent: [{ port: 8546, chainId: 1338 }],
         }),
         title: this.test.fullTitle(),
       },
@@ -67,7 +66,7 @@ describe('Dapp interactions', function () {
         });
 
         await driver.clickElement({ text: 'Next', tag: 'button' });
-        await driver.clickElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
         await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
         await driver.waitForSelector({
           css: '#accounts',
@@ -84,17 +83,17 @@ describe('Dapp interactions', function () {
           '[data-testid ="account-options-menu-button"]',
         );
 
-        await driver.clickElement({ text: 'Connected sites', tag: 'div' });
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        await driver.clickElement({ text: 'Got it', tag: 'button' });
 
         const connectedDapp1 = await driver.isElementPresent({
-          text: DAPP_URL,
-          tag: 'bdi',
+          text: '127.0.0.1:8080',
+          tag: 'p',
         });
         const connectedDapp2 = await driver.isElementPresent({
-          text: DAPP_ONE_URL,
-          tag: 'bdi',
+          text: '127.0.0.1:8081',
+          tag: 'p',
         });
-
         assert.ok(connectedDapp1, 'Account not connected to Dapp1');
         assert.ok(connectedDapp2, 'Account not connected to Dapp2');
       },
diff --git a/test/e2e/tests/dapp-interactions/dapp-tx-edit.spec.js b/test/e2e/tests/dapp-interactions/dapp-tx-edit.spec.js
index 94e4b0084766..df98799a462d 100644
--- a/test/e2e/tests/dapp-interactions/dapp-tx-edit.spec.js
+++ b/test/e2e/tests/dapp-interactions/dapp-tx-edit.spec.js
@@ -56,7 +56,7 @@ describe('Editing confirmations of dapp initiated contract interactions', functi
     );
   });
 
-  it('should show an edit button on a simple ETH send initiated by a dapp', async function () {
+  it('should NOT show an edit button on a simple ETH send initiated by a dapp', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -88,8 +88,8 @@ describe('Editing confirmations of dapp initiated contract interactions', functi
         );
         assert.equal(
           editTransactionButton,
-          true,
-          `Edit transaction button should be visible on a contract interaction created by a dapp`,
+          false,
+          `Edit transaction button should not be visible on a simple send transaction created by a dapp`,
         );
       },
     );
diff --git a/test/e2e/tests/encrypt-decrypt.spec.js b/test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.js
similarity index 98%
rename from test/e2e/tests/encrypt-decrypt.spec.js
rename to test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.js
index e9cac127315b..2f595138d0cf 100644
--- a/test/e2e/tests/encrypt-decrypt.spec.js
+++ b/test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.js
@@ -5,8 +5,8 @@ const {
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 async function validateEncryptionKey(driver, encryptionKey) {
   await driver.clickElement('#getEncryptionKeyButton');
diff --git a/test/e2e/tests/eth-subscribe.spec.js b/test/e2e/tests/dapp-interactions/eth-subscribe.spec.js
similarity index 96%
rename from test/e2e/tests/eth-subscribe.spec.js
rename to test/e2e/tests/dapp-interactions/eth-subscribe.spec.js
index bbcb4db6a6dd..8ca8ec0cc74c 100644
--- a/test/e2e/tests/eth-subscribe.spec.js
+++ b/test/e2e/tests/dapp-interactions/eth-subscribe.spec.js
@@ -4,8 +4,8 @@ const {
   openDapp,
   DAPP_ONE_URL,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('eth_subscribe', function () {
   it('only broadcasts subscription notifications on the page that registered the subscription', async function () {
diff --git a/test/e2e/tests/failing-contract.spec.js b/test/e2e/tests/dapp-interactions/failing-contract.spec.js
similarity index 97%
rename from test/e2e/tests/failing-contract.spec.js
rename to test/e2e/tests/dapp-interactions/failing-contract.spec.js
index ca96f6b971f7..11972d7256c1 100644
--- a/test/e2e/tests/failing-contract.spec.js
+++ b/test/e2e/tests/dapp-interactions/failing-contract.spec.js
@@ -5,9 +5,9 @@ const {
   unlockWallet,
   WINDOW_TITLES,
   generateGanacheOptions,
-} = require('../helpers');
-const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Failing contract interaction ', function () {
   const smartContract = SMART_CONTRACTS.FAILING;
diff --git a/test/e2e/tests/dapp-interactions/permissions.spec.js b/test/e2e/tests/dapp-interactions/permissions.spec.js
index abf5344909c7..5f84587ac096 100644
--- a/test/e2e/tests/dapp-interactions/permissions.spec.js
+++ b/test/e2e/tests/dapp-interactions/permissions.spec.js
@@ -40,7 +40,7 @@ describe('Permissions', function () {
           tag: 'button',
         });
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -50,18 +50,17 @@ describe('Permissions', function () {
         await driver.clickElement(
           '[data-testid="account-options-menu-button"]',
         );
-        await driver.clickElement('.menu-item:nth-of-type(3)');
-
-        await driver.findElement({
-          text: 'Connected sites',
-          tag: 'h2',
+        await driver.clickElement({
+          text: 'All Permissions',
+          tag: 'div',
         });
+        await driver.clickElement({ text: 'Got it', tag: 'button' });
         await driver.waitForSelector({
-          css: '.connected-sites-list__subject-name',
           text: '127.0.0.1:8080',
+          tag: 'p',
         });
         const domains = await driver.findClickableElements(
-          '.connected-sites-list__subject-name',
+          '[data-testid="connection-list-item"]',
         );
         assert.equal(domains.length, 1);
 
diff --git a/test/e2e/tests/provider-api.spec.js b/test/e2e/tests/dapp-interactions/provider-api.spec.js
similarity index 53%
rename from test/e2e/tests/provider-api.spec.js
rename to test/e2e/tests/dapp-interactions/provider-api.spec.js
index b2cd456d5f41..80cca60afb95 100644
--- a/test/e2e/tests/provider-api.spec.js
+++ b/test/e2e/tests/dapp-interactions/provider-api.spec.js
@@ -5,51 +5,10 @@ const {
   withFixtures,
   openDapp,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('MetaMask', function () {
-  it('provider should inform dapp when switching networks', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        const addresses = await ganacheServer.getAccounts();
-        const publicAddress = addresses[0];
-        await unlockWallet(driver);
-
-        await openDapp(driver);
-        const chainIdDiv = await driver.waitForSelector({
-          css: '#chainId',
-          text: '0x539',
-        });
-        assert.equal(await chainIdDiv.getText(), '0x539');
-
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindow(windowHandles[0]);
-
-        await driver.clickElement('[data-testid="network-display"]');
-        await driver.clickElement({ text: 'Ethereum Mainnet', tag: 'p' });
-
-        await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-        const switchedChainIdDiv = await driver.waitForSelector({
-          css: '#chainId',
-          text: '0x1',
-        });
-        const accountsDiv = await driver.findElement('#accounts');
-
-        assert.equal(await switchedChainIdDiv.getText(), '0x1');
-        assert.equal(await accountsDiv.getText(), publicAddress);
-      },
-    );
-  });
-
   it('should reject unsupported methods', async function () {
     await withFixtures(
       {
diff --git a/test/e2e/tests/signin-with-ethereum.spec.js b/test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js
similarity index 97%
rename from test/e2e/tests/signin-with-ethereum.spec.js
rename to test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js
index 251e45023147..5c6e3bb4803c 100644
--- a/test/e2e/tests/signin-with-ethereum.spec.js
+++ b/test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js
@@ -6,8 +6,8 @@ const {
   DAPP_URL,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Sign in with ethereum', function () {
   it('user should be able to confirm sign in with ethereum', async function () {
diff --git a/test/e2e/tests/metrics/dapp-viewed.spec.js b/test/e2e/tests/metrics/dapp-viewed.spec.js
index a32b8190055a..cfa186618df5 100644
--- a/test/e2e/tests/metrics/dapp-viewed.spec.js
+++ b/test/e2e/tests/metrics/dapp-viewed.spec.js
@@ -7,7 +7,6 @@ const {
   openDapp,
   waitForAccountRendered,
   WINDOW_TITLES,
-  DAPP_URL,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 const {
@@ -65,6 +64,33 @@ const waitForDappConnected = async (driver) => {
 };
 
 describe('Dapp viewed Event @no-mmi', function () {
+  const validFakeMetricsId = 'fake-metrics-fd20';
+  it('is not sent when metametrics ID is not valid', async function () {
+    async function mockSegment(mockServer) {
+      return [await mockedDappViewedEndpoint(mockServer)];
+    }
+
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withMetaMetricsController({
+            metaMetricsId: 'invalid-metrics-id',
+            participateInMetaMetrics: true,
+          })
+          .build(),
+        title: this.test.fullTitle(),
+        testSpecificMock: mockSegment,
+      },
+      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+        await unlockWallet(driver);
+        await connectToDapp(driver);
+        const events = await getEventPayloads(driver, mockedEndpoints);
+        assert.equal(events.length, 0);
+      },
+    );
+  });
+
   it('is sent when navigating to dapp with no account connected', async function () {
     async function mockSegment(mockServer) {
       return [await mockedDappViewedEndpoint(mockServer)];
@@ -75,7 +101,7 @@ describe('Dapp viewed Event @no-mmi', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
+            metaMetricsId: validFakeMetricsId, // 1% sample rate for dapp viewed event
             participateInMetaMetrics: true,
           })
           .build(),
@@ -83,7 +109,6 @@ describe('Dapp viewed Event @no-mmi', function () {
         testSpecificMock: mockSegment,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
         await unlockWallet(driver);
 
         await connectToDapp(driver);
@@ -111,7 +136,7 @@ describe('Dapp viewed Event @no-mmi', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
+            metaMetricsId: validFakeMetricsId,
             participateInMetaMetrics: true,
           })
           .build(),
@@ -119,7 +144,6 @@ describe('Dapp viewed Event @no-mmi', function () {
         testSpecificMock: mockSegment,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
         await unlockWallet(driver);
         await waitForAccountRendered(driver);
         await connectToDapp(driver);
@@ -150,7 +174,7 @@ describe('Dapp viewed Event @no-mmi', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
+            metaMetricsId: validFakeMetricsId,
             participateInMetaMetrics: true,
           })
           .build(),
@@ -158,7 +182,6 @@ describe('Dapp viewed Event @no-mmi', function () {
         testSpecificMock: mockSegment,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
         await unlockWallet(driver);
         await waitForAccountRendered(driver);
         await connectToDapp(driver);
@@ -194,7 +217,7 @@ describe('Dapp viewed Event @no-mmi', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
+            metaMetricsId: validFakeMetricsId,
             participateInMetaMetrics: true,
           })
           .build(),
@@ -202,7 +225,6 @@ describe('Dapp viewed Event @no-mmi', function () {
         testSpecificMock: mockSegment,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
         await unlockWallet(driver);
         await waitForAccountRendered(driver);
         await connectToDapp(driver);
@@ -232,7 +254,7 @@ describe('Dapp viewed Event @no-mmi', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
+            metaMetricsId: validFakeMetricsId,
             participateInMetaMetrics: true,
           })
           .build(),
@@ -260,7 +282,7 @@ describe('Dapp viewed Event @no-mmi', function () {
           tag: 'button',
         });
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
         });
 
@@ -286,7 +308,7 @@ describe('Dapp viewed Event @no-mmi', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
+            metaMetricsId: validFakeMetricsId,
             participateInMetaMetrics: true,
           })
           .build(),
@@ -294,7 +316,6 @@ describe('Dapp viewed Event @no-mmi', function () {
         testSpecificMock: mockSegment,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
         await unlockWallet(driver);
         await waitForAccountRendered(driver);
         await connectToDapp(driver);
@@ -310,24 +331,35 @@ describe('Dapp viewed Event @no-mmi', function () {
         await driver.clickElement(
           '[data-testid ="account-options-menu-button"]',
         );
-        await driver.clickElement({ text: 'Connected sites', tag: 'div' });
-        await driver.findElement({
-          text: DAPP_URL,
-          tag: 'bdi',
+        await driver.clickElement({
+          text: 'All Permissions',
+          tag: 'div',
         });
-        await driver.clickElement({ text: 'Disconnect', tag: 'a' });
+        await driver.clickElement({ text: 'Got it', tag: 'button' });
         await driver.clickElement({
-          text: `Disconnect ${DAPP_URL}`,
-          tag: 'h2',
+          text: '127.0.0.1:8080',
+          tag: 'p',
+        });
+        await driver.clickElement(
+          '[data-testid ="account-list-item-menu-button"]',
+        );
+        await driver.clickElement({
+          text: 'Disconnect',
+          tag: 'button',
         });
-        await driver.clickElement({ text: 'Disconnect', tag: 'button' });
+        await driver.clickElement('[data-testid ="disconnect-all"]');
+        await driver.clickElement('button[aria-label="Back"]');
+        await driver.clickElement('button[aria-label="Back"]');
         // validate dapp is not connected
         await driver.clickElement(
           '[data-testid ="account-options-menu-button"]',
         );
-        await driver.clickElement({ text: 'Connected sites', tag: 'div' });
+        await driver.clickElement({
+          text: 'All Permissions',
+          tag: 'div',
+        });
         await driver.findElement({
-          text: 'Account 1 is not connected to any sites.',
+          text: 'Nothing to see here',
           tag: 'p',
         });
         // reconnect again
diff --git a/test/e2e/tests/errors.spec.js b/test/e2e/tests/metrics/errors.spec.js
similarity index 98%
rename from test/e2e/tests/errors.spec.js
rename to test/e2e/tests/metrics/errors.spec.js
index 10ad149f29a3..0961b46c5aa5 100644
--- a/test/e2e/tests/errors.spec.js
+++ b/test/e2e/tests/metrics/errors.spec.js
@@ -5,9 +5,9 @@ const { get, has, set, unset, cloneDeep } = require('lodash');
 const { Browser } = require('selenium-webdriver');
 const { format } = require('prettier');
 const { isObject } = require('@metamask/utils');
-const { SENTRY_UI_STATE } = require('../../../app/scripts/lib/setupSentry');
-const FixtureBuilder = require('../fixture-builder');
-const { convertToHexValue, withFixtures } = require('../helpers');
+const { SENTRY_UI_STATE } = require('../../../../app/scripts/lib/setupSentry');
+const FixtureBuilder = require('../../fixture-builder');
+const { convertToHexValue, withFixtures } = require('../../helpers');
 
 /**
  * Derive a UI state field from a background state field.
@@ -24,7 +24,6 @@ function backgroundToUiField(backgroundField) {
 }
 
 const maskedBackgroundFields = [
-  'CurrencyController.currencyRates.ETH.conversionDate', // This is a timestamp that changes each run
   // App metadata is masked so that we don't have to update the snapshot as
   // part of the release process
   'AppMetadataController.currentAppVersion',
@@ -35,6 +34,11 @@ const maskedBackgroundFields = [
   'AppStateController.surveyLinkLastClickedOrClosed',
   'AppStateController.recoveryPhraseReminderLastShown',
   'AppStateController.termsOfUseLastAgreed',
+  // The value in these properties may change each run
+  'AppStateController.fullScreenGasPollTokens',
+  'AppStateController.notificationGasPollTokens',
+  'AppStateController.popupGasPollTokens',
+  'CurrencyController.currencyRates.ETH.conversionDate',
 ];
 const maskedUiFields = maskedBackgroundFields.map(backgroundToUiField);
 
diff --git a/test/e2e/tests/metrics/permissions-approved.spec.js b/test/e2e/tests/metrics/permissions-approved.spec.js
index 9db55604e081..94c82d34fabd 100644
--- a/test/e2e/tests/metrics/permissions-approved.spec.js
+++ b/test/e2e/tests/metrics/permissions-approved.spec.js
@@ -50,7 +50,7 @@ describe('Permissions Approved Event', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
+            metaMetricsId: 'fake-metrics-fd20',
             participateInMetaMetrics: true,
           })
           .build(),
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
similarity index 93%
rename from test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
rename to test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 85b35d794363..54ba077da339 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -24,9 +24,9 @@
     "connectedStatusPopoverHasBeenShown": true,
     "defaultHomeActiveTabName": null,
     "browserEnvironment": { "os": "string", "browser": "string" },
-    "popupGasPollTokens": [],
-    "notificationGasPollTokens": [],
-    "fullScreenGasPollTokens": [],
+    "popupGasPollTokens": "object",
+    "notificationGasPollTokens": "object",
+    "fullScreenGasPollTokens": "object",
     "recoveryPhraseReminderHasBeenShown": true,
     "recoveryPhraseReminderLastShown": "number",
     "outdatedBrowserWarningLastShown": "number",
@@ -34,7 +34,6 @@
     "showTestnetMessageInDropdown": true,
     "showBetaHeader": false,
     "showPermissionsTour": true,
-    "showProductTour": true,
     "showNetworkBanner": true,
     "showAccountBanner": true,
     "trezorModel": null,
@@ -45,7 +44,10 @@
     "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
-    "signatureSecurityAlertResponses": "object"
+    "signatureSecurityAlertResponses": "object",
+    "switchedNetworkDetails": "object",
+    "switchedNetworkNeverShowMessage": "boolean",
+    "currentExtensionPopupId": "number"
   },
   "ApprovalController": {
     "pendingApprovals": "object",
@@ -79,7 +81,8 @@
     "gasFeeEstimatesByChainId": {},
     "gasFeeEstimates": {},
     "estimatedGasFeeTimeBounds": {},
-    "gasEstimateType": "none"
+    "gasEstimateType": "none",
+    "nonRPCGasFeeApisDisabled": "boolean"
   },
   "KeyringController": {
     "isUnlocked": false,
@@ -144,18 +147,18 @@
     "dismissSeedBackUpReminder": true,
     "disabledRpcMethodPreferences": { "eth_sign": false },
     "useMultiAccountBalanceChecker": true,
+    "hasDismissedOpenSeaToBlockaidBanner": false,
     "useSafeChainsListValidation": "boolean",
     "useTokenDetection": false,
     "useNftDetection": false,
     "use4ByteResolution": true,
     "useCurrencyRateCheck": true,
-    "useRequestQueue": false,
+    "useRequestQueue": true,
     "openSeaEnabled": false,
     "securityAlertsEnabled": "boolean",
     "addSnapAccountEnabled": "boolean",
     "advancedGasFee": {},
     "featureFlags": {},
-    "hasDismissedOpenSeaToBlockaidBanner": false,
     "incomingTransactionsPreferences": {},
     "knownMethodData": "object",
     "currentLocale": "en",
@@ -167,9 +170,11 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": true
     },
+    "useExternalServices": "boolean",
     "ipfsGateway": "string",
     "isIpfsGatewayEnabled": "boolean",
     "useAddressBarEnsResolution": true,
@@ -179,6 +184,7 @@
     "snapsAddSnapAccountModalDismissed": "boolean",
     "useExternalNameSources": "boolean",
     "useTransactionSimulations": true,
+    "enableMV3TimestampSave": true,
     "selectedAddress": "string"
   },
   "SelectedNetworkController": { "domains": "object" },
@@ -240,7 +246,7 @@
   "TokenListController": {
     "tokenList": "object",
     "tokensChainsCache": {},
-    "preventPollingOnNetworkRestart": true
+    "preventPollingOnNetworkRestart": false
   },
   "TokenRatesController": {
     "contractExchangeRates": "object",
diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
similarity index 93%
rename from test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
rename to test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index d0d28f8cae09..fbc330dffdfe 100644
--- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -3,6 +3,7 @@
   "activeTab": "object",
   "appState": "object",
   "confirm": "object",
+  "confirmAlerts": "object",
   "confirmTransaction": "object",
   "gas": { "customData": { "price": null, "limit": null } },
   "history": { "mostRecentOverviewPage": "/" },
@@ -13,7 +14,6 @@
     "isUnlocked": false,
     "isAccountMenuOpen": false,
     "isNetworkMenuOpen": false,
-    "identities": "object",
     "internalAccounts": { "accounts": "object", "selectedAccount": "string" },
     "transactions": "object",
     "networkConfigurations": "object",
@@ -31,6 +31,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
+      "smartTransactionsOptInStatus": false,
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": true
     },
@@ -59,9 +60,9 @@
     "connectedStatusPopoverHasBeenShown": true,
     "defaultHomeActiveTabName": null,
     "browserEnvironment": { "os": "string", "browser": "string" },
-    "popupGasPollTokens": [],
-    "notificationGasPollTokens": [],
-    "fullScreenGasPollTokens": [],
+    "popupGasPollTokens": "object",
+    "notificationGasPollTokens": "object",
+    "fullScreenGasPollTokens": "object",
     "recoveryPhraseReminderHasBeenShown": true,
     "recoveryPhraseReminderLastShown": "number",
     "outdatedBrowserWarningLastShown": "number",
@@ -69,12 +70,10 @@
     "showTestnetMessageInDropdown": true,
     "showBetaHeader": false,
     "showPermissionsTour": true,
-    "showProductTour": true,
     "showNetworkBanner": true,
     "showAccountBanner": true,
     "trezorModel": null,
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
-    "hasDismissedOpenSeaToBlockaidBanner": false,
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
     "qrHardware": {},
@@ -82,6 +81,9 @@
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
     "signatureSecurityAlertResponses": "object",
+    "switchedNetworkDetails": "object",
+    "switchedNetworkNeverShowMessage": "boolean",
+    "currentExtensionPopupId": "number",
     "currentAppVersion": "string",
     "previousAppVersion": "",
     "previousMigrationVersion": 0,
@@ -98,17 +100,20 @@
     "usePhishDetect": true,
     "dismissSeedBackUpReminder": true,
     "disabledRpcMethodPreferences": { "eth_sign": false },
+    "useExternalServices": "boolean",
     "useMultiAccountBalanceChecker": true,
+    "hasDismissedOpenSeaToBlockaidBanner": false,
     "useSafeChainsListValidation": true,
     "useTokenDetection": false,
     "useNftDetection": false,
     "useCurrencyRateCheck": true,
-    "useRequestQueue": false,
+    "useRequestQueue": true,
     "openSeaEnabled": false,
     "securityAlertsEnabled": "boolean",
     "addSnapAccountEnabled": "boolean",
     "advancedGasFee": {},
     "incomingTransactionsPreferences": {},
+    "identities": "object",
     "lostIdentities": "object",
     "forgottenPassword": false,
     "ipfsGateway": "string",
@@ -120,6 +125,7 @@
     "snapsAddSnapAccountModalDismissed": "boolean",
     "useExternalNameSources": "boolean",
     "useTransactionSimulations": true,
+    "enableMV3TimestampSave": true,
     "selectedAddress": "string",
     "metaMetricsId": "fake-metrics-id",
     "eventsBeforeMetricsOptIn": "object",
@@ -145,9 +151,10 @@
     "gasFeeEstimates": {},
     "estimatedGasFeeTimeBounds": {},
     "gasEstimateType": "none",
+    "nonRPCGasFeeApisDisabled": "boolean",
     "tokenList": "object",
     "tokensChainsCache": {},
-    "preventPollingOnNetworkRestart": true,
+    "preventPollingOnNetworkRestart": false,
     "tokens": "object",
     "ignoredTokens": "object",
     "detectedTokens": "object",
diff --git a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
similarity index 93%
rename from test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json
rename to test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index b6489b41f841..c8d1a8194a82 100644
--- a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -20,9 +20,9 @@
       "connectedStatusPopoverHasBeenShown": true,
       "termsOfUseLastAgreed": "number",
       "defaultHomeActiveTabName": null,
-      "fullScreenGasPollTokens": [],
-      "notificationGasPollTokens": [],
-      "popupGasPollTokens": [],
+      "popupGasPollTokens": "object",
+      "notificationGasPollTokens": "object",
+      "fullScreenGasPollTokens": "object",
       "qrHardware": {},
       "recoveryPhraseReminderHasBeenShown": true,
       "recoveryPhraseReminderLastShown": "number",
@@ -85,6 +85,7 @@
     "PreferencesController": {
       "advancedGasFee": null,
       "currentLocale": "en",
+      "useExternalServices": "boolean",
       "dismissSeedBackUpReminder": true,
       "featureFlags": {},
       "forgottenPassword": false,
@@ -99,6 +100,7 @@
         "showExtensionInFullSizeView": false,
         "showFiatInTestnets": false,
         "showTestNetworks": false,
+        "smartTransactionsOptInStatus": false,
         "useNativeCurrencyAsPrimaryCurrency": true,
         "petnamesEnabled": true
       },
@@ -111,11 +113,9 @@
       "useTokenDetection": false,
       "useCurrencyRateCheck": true,
       "useMultiAccountBalanceChecker": true,
-      "useRequestQueue": false
-    },
-    "SelectedNetworkController": {
-      "domains": "object"
+      "useRequestQueue": true
     },
+    "SelectedNetworkController": { "domains": "object" },
     "SmartTransactionsController": {
       "smartTransactionsState": {
         "fees": {},
diff --git a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
similarity index 93%
rename from test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json
rename to test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index 6c3c9bec6eb6..ba5eeed5c438 100644
--- a/test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -20,9 +20,9 @@
       "connectedStatusPopoverHasBeenShown": true,
       "termsOfUseLastAgreed": "number",
       "defaultHomeActiveTabName": null,
-      "fullScreenGasPollTokens": [],
-      "notificationGasPollTokens": [],
-      "popupGasPollTokens": [],
+      "popupGasPollTokens": "object",
+      "notificationGasPollTokens": "object",
+      "fullScreenGasPollTokens": "object",
       "qrHardware": {},
       "recoveryPhraseReminderHasBeenShown": true,
       "recoveryPhraseReminderLastShown": "number",
@@ -85,6 +85,7 @@
     "PreferencesController": {
       "advancedGasFee": null,
       "currentLocale": "en",
+      "useExternalServices": "boolean",
       "dismissSeedBackUpReminder": true,
       "featureFlags": {},
       "forgottenPassword": false,
@@ -99,6 +100,7 @@
         "showExtensionInFullSizeView": false,
         "showFiatInTestnets": false,
         "showTestNetworks": false,
+        "smartTransactionsOptInStatus": false,
         "useNativeCurrencyAsPrimaryCurrency": true,
         "petnamesEnabled": true
       },
@@ -111,11 +113,9 @@
       "useTokenDetection": false,
       "useCurrencyRateCheck": true,
       "useMultiAccountBalanceChecker": true,
-      "useRequestQueue": false
-    },
-    "SelectedNetworkController": {
-      "domains": "object"
+      "useRequestQueue": true
     },
+    "SelectedNetworkController": { "domains": "object" },
     "SmartTransactionsController": {
       "smartTransactionsState": {
         "fees": {},
diff --git a/test/e2e/tests/metrics/swaps.spec.js b/test/e2e/tests/metrics/swaps.spec.js
index 65e9655abb53..ac76eb1fbdd6 100644
--- a/test/e2e/tests/metrics/swaps.spec.js
+++ b/test/e2e/tests/metrics/swaps.spec.js
@@ -29,7 +29,7 @@ const {
   FEATURE_FLAGS_API_MOCK_RESULT,
   TRADES_API_MOCK_RESULT,
   NETWORKS_2_API_MOCK_RESULT,
-} = require('./mock-data');
+} = require('../../../data/mock-data');
 
 const numberOfSegmentRequests = 19;
 
@@ -197,7 +197,7 @@ async function assertNavSwapButtonClickedEvent(reqs) {
 async function assertPrepareSwapPageLoadedEvents(reqs) {
   const assertionsReq1 = [
     (req) => req.event === MetaMetricsEventName.PrepareSwapPageLoaded,
-    (req) => Object.keys(req.properties).length === 7,
+    (req) => Object.keys(req.properties).length === 8,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -228,7 +228,7 @@ async function assertPrepareSwapPageLoadedEvents(reqs) {
 async function assertQuotesRequestedEvents(reqs) {
   const assertionsReq3 = [
     (req) => req.event === MetaMetricsEventName.QuotesRequested,
-    (req) => Object.keys(req.properties).length === 14,
+    (req) => Object.keys(req.properties).length === 15,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -266,7 +266,7 @@ async function assertQuotesRequestedEvents(reqs) {
 async function assertQuotesReceivedAndBestQuoteReviewedEvents(reqs) {
   const assertionsReq5 = [
     (req) => req.event === MetaMetricsEventName.QuotesReceived,
-    (req) => Object.keys(req.properties).length === 18,
+    (req) => Object.keys(req.properties).length === 19,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -301,7 +301,7 @@ async function assertQuotesReceivedAndBestQuoteReviewedEvents(reqs) {
 
   const assertionsReq7 = [
     (req) => req.event === MetaMetricsEventName.BestQuoteReviewed,
-    (req) => Object.keys(req.properties).length === 17,
+    (req) => Object.keys(req.properties).length === 18,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -348,7 +348,7 @@ async function assertQuotesReceivedAndBestQuoteReviewedEvents(reqs) {
 async function assertAllAvailableQuotesOpenedEvents(reqs) {
   const assertionsReq9 = [
     (req) => req.event === MetaMetricsEventName.AllAvailableQuotesOpened,
-    (req) => Object.keys(req.properties).length === 18,
+    (req) => Object.keys(req.properties).length === 19,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -391,7 +391,7 @@ async function assertAllAvailableQuotesOpenedEvents(reqs) {
 async function assertSwapStartedEvents(reqs) {
   const assertionsReq11 = [
     (req) => req.event === MetaMetricsEventName.SwapStarted,
-    (req) => Object.keys(req.properties).length === 24,
+    (req) => Object.keys(req.properties).length === 25,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -438,7 +438,7 @@ async function assertSwapStartedEvents(reqs) {
 async function assertSwapCompletedEvents(reqs) {
   const assertionsReq13 = [
     (req) => req.event === MetaMetricsEventName.SwapCompleted,
-    (req) => Object.keys(req.properties).length === 30,
+    (req) => Object.keys(req.properties).length === 31,
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
     (req) => req.properties?.environment_type === 'background',
@@ -490,7 +490,7 @@ async function assertSwapCompletedEvents(reqs) {
 async function assertExitedSwapsEvents(reqs) {
   const assertionsReq15 = [
     (req) => req.event === MetaMetricsEventName.ExitedSwaps,
-    (req) => Object.keys(req.properties).length === 12,
+    (req) => Object.keys(req.properties).length === 13,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
@@ -524,7 +524,7 @@ async function assertExitedSwapsEvents(reqs) {
 
   const assertionsReq17 = [
     (req) => req.event === MetaMetricsEventName.ExitedSwaps,
-    (req) => Object.keys(req.properties).length === 9,
+    (req) => Object.keys(req.properties).length === 10,
 
     (req) => req.properties?.category === MetaMetricsEventCategory.Swaps,
     (req) => req.properties?.chain_id === toHex(1337),
diff --git a/test/e2e/tests/multichain/connection-page.spec.js b/test/e2e/tests/multichain/connection-page.spec.js
new file mode 100644
index 000000000000..f74ecf772b11
--- /dev/null
+++ b/test/e2e/tests/multichain/connection-page.spec.js
@@ -0,0 +1,178 @@
+const { strict: assert } = require('assert');
+const {
+  withFixtures,
+  unlockWallet,
+  WINDOW_TITLES,
+  waitForAccountRendered,
+  connectToDapp,
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+
+const accountLabel2 = '2nd custom name';
+const accountLabel3 = '3rd custom name';
+
+describe('Connections page', function () {
+  it('should disconnect when click on Disconnect button in connections page', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+        await waitForAccountRendered(driver);
+        await connectToDapp(driver);
+
+        // It should render connected status for button if dapp is connected
+        const getConnectedStatus = await driver.waitForSelector({
+          css: '#connectButton',
+          text: 'Connected',
+        });
+        assert.ok(getConnectedStatus, 'Account is connected to Dapp');
+
+        // Switch to extension Tab
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.clickElement(
+          '[data-testid ="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        await driver.clickElement({ text: 'Got it', tag: 'button' });
+        await driver.clickElement({
+          text: '127.0.0.1:8080',
+          tag: 'p',
+        });
+        await driver.clickElement('[data-testid ="connections-page"]');
+        const connectionsPage = await driver.isElementPresent({
+          text: '127.0.0.1:8080',
+          tag: 'span',
+        });
+        assert.ok(connectionsPage, 'Connections Page is defined');
+        await driver.clickElement(
+          '[data-testid ="account-list-item-menu-button"]',
+        );
+        await driver.clickElement({ text: 'Disconnect', tag: 'button' });
+        await driver.clickElement('[data-testid ="disconnect-all"]');
+        await driver.clickElement('button[aria-label="Back"]');
+        await driver.clickElement('button[aria-label="Back"]');
+        // validate dapp is not connected
+        await driver.clickElement(
+          '[data-testid ="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        const noAccountConnected = await driver.isElementPresent({
+          text: 'Nothing to see here',
+          tag: 'p',
+        });
+        assert.ok(
+          noAccountConnected,
+          'Account disconected from connections page',
+        );
+
+        // Switch back to Dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Button should show Connect text if dapp is not connected
+
+        const getConnectStatus = await driver.waitForSelector({
+          css: '#connectButton',
+          text: 'Connect',
+        });
+
+        assert.ok(
+          getConnectStatus,
+          'Account is not connected to Dapp and button has text connect',
+        );
+      },
+    );
+  });
+  it('should connect more accounts when already connected to a dapp', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+        await waitForAccountRendered(driver);
+        await connectToDapp(driver);
+
+        const account = await driver.findElement('#accounts');
+        const accountAddress = await account.getText();
+
+        // Dapp should contain single connected account address
+        assert.strictEqual(
+          accountAddress,
+          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+        );
+        // disconnect dapp in fullscreen view
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Add two new accounts with custom label
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-action-button"]',
+        );
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-add-account"]',
+        );
+        await driver.fill('[placeholder="Account 2"]', accountLabel2);
+        await driver.clickElement({ text: 'Create', tag: 'button' });
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-action-button"]',
+        );
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-add-account"]',
+        );
+        await driver.fill('[placeholder="Account 3"]', accountLabel3);
+        await driver.clickElement({ text: 'Create', tag: 'button' });
+        await waitForAccountRendered(driver);
+        await driver.clickElement(
+          '[data-testid ="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        await driver.clickElement({ text: 'Got it', tag: 'button' });
+        await driver.clickElement({
+          text: '127.0.0.1:8080',
+          tag: 'p',
+        });
+
+        // Connect only second account and keep third account unconnected
+        await driver.clickElement({
+          text: 'Connect more accounts',
+          tag: 'button',
+        });
+        await driver.clickElement({
+          text: '2nd custom name',
+          tag: 'button',
+        });
+        await driver.clickElement(
+          '[data-testid ="connect-more-accounts-button"]',
+        );
+        const newAccountConnected = await driver.isElementPresent({
+          text: '2nd custom name',
+          tag: 'button',
+        });
+
+        assert.ok(newAccountConnected, 'Connected More Account Successfully');
+        // Switch back to Dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+        // Find the span element that contains the account addresses
+        const accounts = await driver.findElement('#accounts');
+        const accountAddresses = await accounts.getText();
+
+        // Dapp should contain both the connected account addresses
+        assert.strictEqual(
+          accountAddresses,
+          '0x09781764c08de8ca82e156bbf156a3ca217c7950,0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+        );
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/multichain/permission-page.spec.js b/test/e2e/tests/multichain/permission-page.spec.js
new file mode 100644
index 000000000000..28e620b773d7
--- /dev/null
+++ b/test/e2e/tests/multichain/permission-page.spec.js
@@ -0,0 +1,82 @@
+const { strict: assert } = require('assert');
+const {
+  withFixtures,
+  unlockWallet,
+  WINDOW_TITLES,
+  waitForAccountRendered,
+  connectToDapp,
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+
+describe('Permissions Page', function () {
+  it('should show connected site permissions when a single dapp is connected', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+        await waitForAccountRendered(driver);
+        await connectToDapp(driver);
+
+        // close test dapp window to avoid future confusion
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.closeWindowHandle(windowHandles[1]);
+        // disconnect dapp in fullscreen view
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.clickElement(
+          '[data-testid ="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        await driver.clickElement({ text: 'Got it', tag: 'button' });
+        const connectedDapp = await driver.isElementPresent({
+          text: '127.0.0.1:8080',
+          tag: 'p',
+        });
+        assert.ok(connectedDapp, 'Account connected to Dapp1');
+      },
+    );
+  });
+
+  it('should redirect users to connections page when users click on connected permission', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+        await waitForAccountRendered(driver);
+        await connectToDapp(driver);
+
+        // close test dapp window to avoid future confusion
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.closeWindowHandle(windowHandles[1]);
+        // disconnect dapp in fullscreen view
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.clickElement(
+          '[data-testid ="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        await driver.clickElement({ text: 'Got it', tag: 'button' });
+        await driver.clickElement({
+          text: '127.0.0.1:8080',
+          tag: 'p',
+        });
+        await driver.clickElement('[data-testid ="connections-page"]');
+        const connectionsPage = await driver.isElementPresent({
+          text: '127.0.0.1:8080',
+          tag: 'span',
+        });
+        assert.ok(connectionsPage, 'Connections Page is defined');
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/network/add-custom-network.spec.js b/test/e2e/tests/network/add-custom-network.spec.js
index 183679bc0998..f849c9b0fc12 100644
--- a/test/e2e/tests/network/add-custom-network.spec.js
+++ b/test/e2e/tests/network/add-custom-network.spec.js
@@ -11,6 +11,7 @@ const {
 } = require('../../helpers');
 
 const TEST_CHAIN_ID = toHex(100);
+const TEST_COLLISION_CHAIN_ID = toHex(78);
 
 const MOCK_CHAINLIST_RESPONSE = [
   {
@@ -62,6 +63,61 @@ const MOCK_CHAINLIST_RESPONSE = [
   },
 ];
 
+const selectors = {
+  accountOptionsMenuButton: '[data-testid="account-options-menu-button"]',
+  informationSymbol: '[data-testid="info-tooltip"]',
+  settingsOption: { text: 'Settings', tag: 'div' },
+  networkOption: { text: 'Networks', tag: 'div' },
+  addNetwork: { text: 'Add a network', tag: 'button' },
+  addNetworkManually: { text: 'Add a network manually', tag: 'h6' },
+  generalOption: { text: 'General', tag: 'div' },
+  generalTabHeader: { text: 'General', tag: 'h4' },
+  ethereumNetwork: { text: 'Ethereum Mainnet', tag: 'div' },
+  newUpdateNetwork: { text: 'Update Network', tag: 'div' },
+  deleteButton: { text: 'Delete', tag: 'button' },
+  cancelButton: { text: 'Cancel', tag: 'button' },
+  saveButton: { text: 'Save', tag: 'button' },
+  updatedNetworkDropDown: { tag: 'span', text: 'Update Network' },
+  errorMessageInvalidUrl: {
+    tag: 'h6',
+    text: 'URLs require the appropriate HTTP/HTTPS prefix.',
+  },
+  warningSymbol: {
+    tag: 'h6',
+    text: 'URLs require the appropriate HTTP/HTTPS prefix.',
+  },
+  suggestedTicker: '[data-testid="network-form-ticker-suggestion"]',
+  tickerWarning: '[data-testid="network-form-ticker-warning"]',
+  tickerButton: { text: 'PETH', tag: 'button' },
+  networkAdded: { text: 'Network added successfully!', tag: 'h4' },
+
+  networkNameInputField: '[data-testid="network-form-network-name"]',
+  networkNameInputFieldSetToEthereumMainnet: {
+    xpath:
+      "//input[@data-testid = 'network-form-network-name'][@value = 'Ethereum Mainnet']",
+  },
+  rpcUrlInputField: '[data-testid="network-form-rpc-url"]',
+  chainIdInputField: '[data-testid="network-form-chain-id"]',
+  tickerInputField: '[data-testid="network-form-ticker-input"]',
+  explorerInputField: '[data-testid="network-form-block-explorer-url"]',
+  errorContainer: '.settings-tab__error',
+};
+
+async function navigateToAddNetwork(driver) {
+  await driver.clickElement(selectors.accountOptionsMenuButton);
+  await driver.clickElement(selectors.settingsOption);
+  await driver.clickElement(selectors.networkOption);
+  await driver.clickElement(selectors.addNetwork);
+  await driver.clickElement(selectors.addNetworkManually);
+}
+
+const inputData = {
+  networkName: 'Collision network',
+  rpcUrl: 'https://responsive-rpc.url/',
+  chainId: '78',
+  ticker: 'TST',
+};
+
 describe('Custom network', function () {
   const chainID = '42161';
   const networkURL = 'https://arbitrum-mainnet.infura.io';
@@ -621,6 +677,180 @@ describe('Custom network', function () {
       );
     });
   });
+
+  describe('customNetwork', function () {
+    it('should add mainnet network', async function () {
+      async function mockRPCURLAndChainId(mockServer) {
+        return [
+          await mockServer
+            .forPost('https://responsive-rpc.url/')
+            .thenCallback(() => ({
+              statusCode: 200,
+              json: {
+                id: '1694444405781',
+                jsonrpc: '2.0',
+                result: TEST_CHAIN_ID,
+              },
+            })),
+        ];
+      }
+
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockRPCURLAndChainId,
+        },
+
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await navigateToAddNetwork(driver);
+          await driver.fill(
+            selectors.networkNameInputField,
+            'Ethereum mainnet',
+          );
+          await driver.fill(
+            selectors.rpcUrlInputField,
+            'https://responsive-rpc.url',
+          );
+          await driver.fill(selectors.chainIdInputField, TEST_CHAIN_ID);
+          await driver.fill(selectors.tickerInputField, 'XDAI');
+          await driver.fill(selectors.explorerInputField, 'https://test.com');
+
+          const suggestedTicker = await driver.isElementPresent(
+            selectors.suggestedTicker,
+          );
+
+          const tickerWarning = await driver.isElementPresent(
+            selectors.tickerWarning,
+          );
+
+          assert.equal(suggestedTicker, false);
+          assert.equal(tickerWarning, false);
+
+          driver.clickElement(selectors.tickerButton);
+          driver.clickElement(selectors.saveButton);
+
+          // Validate the network was added
+          const networkAdded = await driver.isElementPresent(
+            selectors.networkAdded,
+          );
+          assert.equal(networkAdded, true, 'Network added successfully!');
+        },
+      );
+    });
+
+    it('should check symbol and show warnings', async function () {
+      async function mockRPCURLAndChainId(mockServer) {
+        return [
+          await mockServer
+            .forPost('https://responsive-rpc.url/')
+            .thenCallback(() => ({
+              statusCode: 200,
+              json: {
+                id: '1694444405781',
+                jsonrpc: '2.0',
+                result: TEST_CHAIN_ID,
+              },
+            })),
+        ];
+      }
+
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockRPCURLAndChainId,
+        },
+
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await navigateToAddNetwork(driver);
+          await driver.fill(
+            selectors.networkNameInputField,
+            'Ethereum mainnet',
+          );
+          await driver.fill(
+            selectors.rpcUrlInputField,
+            'https://responsive-rpc.url',
+          );
+          await driver.fill(selectors.chainIdInputField, '1');
+          await driver.fill(selectors.tickerInputField, 'TST');
+          await driver.fill(selectors.explorerInputField, 'https://test.com');
+
+          const suggestedTicker = await driver.isElementPresent(
+            selectors.suggestedTicker,
+          );
+
+          const tickerWarning = await driver.isElementPresent(
+            selectors.tickerWarning,
+          );
+
+          // suggestion and warning ticker should be displayed
+          assert.equal(suggestedTicker, true);
+          assert.equal(tickerWarning, true);
+        },
+      );
+    });
+    it('should add collision network', async function () {
+      async function mockRPCURLAndChainId(mockServer) {
+        return [
+          await mockServer
+            .forPost('https://responsive-rpc.url/')
+            .thenCallback(() => ({
+              statusCode: 200,
+              json: {
+                id: '1694444405781',
+                jsonrpc: '2.0',
+                result: TEST_COLLISION_CHAIN_ID,
+              },
+            })),
+        ];
+      }
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockRPCURLAndChainId,
+        },
+
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await navigateToAddNetwork(driver);
+          await driver.fill(
+            selectors.networkNameInputField,
+            inputData.networkName,
+          );
+          await driver.fill(selectors.rpcUrlInputField, inputData.rpcUrl);
+          await driver.fill(selectors.chainIdInputField, inputData.chainId);
+          await driver.fill(selectors.tickerInputField, inputData.ticker);
+
+          const suggestedTicker = await driver.isElementPresent(
+            selectors.suggestedTicker,
+          );
+
+          const tickerWarning = await driver.isElementPresent(
+            selectors.tickerWarning,
+          );
+
+          assert.equal(suggestedTicker, true);
+          assert.equal(tickerWarning, true);
+
+          driver.clickElement(selectors.tickerButton);
+          driver.clickElement(selectors.saveButton);
+
+          // Validate the network was added
+          const networkAdded = await driver.isElementPresent(
+            selectors.networkAdded,
+          );
+          assert.equal(networkAdded, true, 'Network added successfully!');
+        },
+      );
+    });
+  });
 });
 
 async function checkThatSafeChainsListValidationToggleIsOn(driver) {
diff --git a/test/e2e/tests/network/chain-interactions.spec.js b/test/e2e/tests/network/chain-interactions.spec.js
index b8d05a0bd86a..c03387c93155 100644
--- a/test/e2e/tests/network/chain-interactions.spec.js
+++ b/test/e2e/tests/network/chain-interactions.spec.js
@@ -12,7 +12,7 @@ describe('Chain Interactions', function () {
   const port = 8546;
   const chainId = 1338;
   const ganacheOptions = generateGanacheOptions({
-    concurrent: { port, chainId },
+    concurrent: [{ port, chainId }],
   });
   it('should add the Ganache test chain and not switch the network', async function () {
     await withFixtures(
diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/network/custom-rpc-history.spec.js
similarity index 98%
rename from test/e2e/tests/custom-rpc-history.spec.js
rename to test/e2e/tests/network/custom-rpc-history.spec.js
index ef6df367cdb6..7df8746a2e62 100644
--- a/test/e2e/tests/custom-rpc-history.spec.js
+++ b/test/e2e/tests/network/custom-rpc-history.spec.js
@@ -5,8 +5,8 @@ const {
   withFixtures,
   regularDelayMs,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Custom RPC history', function () {
   it(`creates first custom RPC entry`, async function () {
@@ -17,7 +17,7 @@ describe('Custom RPC history', function () {
       {
         fixtures: new FixtureBuilder().build(),
         ganacheOptions: generateGanacheOptions({
-          concurrent: { port, chainId },
+          concurrent: [{ port, chainId }],
         }),
         title: this.test.fullTitle(),
       },
diff --git a/test/e2e/tests/network/network-error.spec.js b/test/e2e/tests/network/network-error.spec.js
index 176f24005066..72eb63270f89 100644
--- a/test/e2e/tests/network/network-error.spec.js
+++ b/test/e2e/tests/network/network-error.spec.js
@@ -72,11 +72,9 @@ describe('Gas API fallback', function () {
 
         await driver.clickElement({ text: 'Next', tag: 'button' });
 
-        await driver.findElement('.transaction-alerts');
-
-        const error = await driver.isElementPresent({
-          text: 'Network is busy. Gas prices are high and estimates are less accurate.',
-        });
+        const error = await driver.isElementPresent(
+          '[data-testid="network-busy-tooltip"]',
+        );
 
         assert.equal(error, true, 'Network error is present');
       },
diff --git a/test/e2e/tests/network/switch-custom-network.spec.js b/test/e2e/tests/network/switch-custom-network.spec.js
index 68c474d81f9e..694a8f309f01 100644
--- a/test/e2e/tests/network/switch-custom-network.spec.js
+++ b/test/e2e/tests/network/switch-custom-network.spec.js
@@ -17,11 +17,13 @@ describe('Switch ethereum chain', function () {
           .withPermissionControllerConnectedToTestDapp()
           .build(),
         ganacheOptions: generateGanacheOptions({
-          concurrent: {
-            port: 8546,
-            chainId: 1338,
-            ganacheOptions2: {},
-          },
+          concurrent: [
+            {
+              port: 8546,
+              chainId: 1338,
+              ganacheOptions2: {},
+            },
+          ],
         }),
         title: this.test.fullTitle(),
       },
diff --git a/test/e2e/tests/onboarding/onboarding.spec.js b/test/e2e/tests/onboarding/onboarding.spec.js
index 3e6bad3eda65..e6a628c336ae 100644
--- a/test/e2e/tests/onboarding/onboarding.spec.js
+++ b/test/e2e/tests/onboarding/onboarding.spec.js
@@ -18,8 +18,12 @@ const {
   onboardingRevealAndConfirmSRP,
   onboardingCompleteWalletCreation,
   regularDelayMs,
+  unlockWallet,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
+const {
+  FirstTimeFlowType,
+} = require('../../../../shared/constants/onboarding');
 
 describe('MetaMask onboarding @no-mmi', function () {
   const wrongSeedPhrase =
@@ -258,7 +262,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         fixtures: new FixtureBuilder({ onboarding: true }).build(),
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: { port, chainId, ganacheOptions2 },
+          concurrent: [{ port, chainId, ganacheOptions2 }],
         },
         title: this.test.fullTitle(),
       },
@@ -303,7 +307,38 @@ describe('MetaMask onboarding @no-mmi', function () {
           text: networkName,
         });
 
-        await locateAccountBalanceDOM(driver, secondaryGanacheServer);
+        await locateAccountBalanceDOM(driver, secondaryGanacheServer[0]);
+      },
+    );
+  });
+
+  it('User can turn off basic functionality in advanced configurations', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await importSRPOnboardingFlow(
+          driver,
+          TEST_SEED_PHRASE,
+          WALLET_PASSWORD,
+        );
+
+        await driver.clickElement({ text: 'Advanced configuration', tag: 'a' });
+        await driver.clickElement(
+          '[data-testid="basic-functionality-toggle"] .toggle-button',
+        );
+        await driver.clickElement('[id="basic-configuration-checkbox"]');
+        await driver.clickElement({ text: 'Turn off', tag: 'button' });
+        await driver.clickElement({ text: 'Done', tag: 'button' });
+        // Check that the 'basic functionality is off' banner is displayed on the home screen after onboarding completion
+        await driver.waitForSelector({
+          text: 'Basic functionality is off',
+          css: '.mm-banner-alert',
+        });
       },
     );
   });
@@ -443,4 +478,55 @@ describe('MetaMask onboarding @no-mmi', function () {
       },
     );
   });
+
+  it('Provides an onboarding path for a user who has restored their account from state persistence failure', async function () {
+    // We don't use onboarding:true here because we want there to be a vault,
+    // simulating what will happen when a user eventually restores their vault
+    // during a state persistence failure. Instead, we set the
+    // firstTimeFlowType to 'restore' and completedOnboarding to false. as well
+    // as some other first time state options to get us into an onboarding
+    // state similar to a new state tree.
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withOnboardingController({
+            completedOnboarding: false,
+            firstTimeFlowType: FirstTimeFlowType.restore,
+            seedPhraseBackedUp: null,
+          })
+          .withMetaMetricsController({
+            participateInMetaMetrics: null,
+            metaMetricsId: null,
+          })
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // First screen we should be on is MetaMetrics
+        assert.equal(
+          await driver.isElementPresent({
+            text: 'Help us improve MetaMask',
+            tag: 'h2',
+          }),
+          true,
+          'First screen should be MetaMetrics',
+        );
+
+        // select no thanks
+        await driver.clickElement('[data-testid="metametrics-no-thanks"]');
+
+        // Next should be Secure your wallet screen
+        assert.equal(
+          await driver.isElementPresent({
+            text: 'Secure your wallet',
+            tag: 'h2',
+          }),
+          true,
+        );
+      },
+    );
+  });
 });
diff --git a/test/e2e/mock-page-with-disallowed-iframe/index.html b/test/e2e/tests/phishing-controller/mock-page-with-disallowed-iframe/index.html
similarity index 94%
rename from test/e2e/mock-page-with-disallowed-iframe/index.html
rename to test/e2e/tests/phishing-controller/mock-page-with-disallowed-iframe/index.html
index ffadeeefa819..943fc6ccc48f 100644
--- a/test/e2e/mock-page-with-disallowed-iframe/index.html
+++ b/test/e2e/tests/phishing-controller/mock-page-with-disallowed-iframe/index.html
@@ -3,7 +3,7 @@
 <head>
   <title>Mock E2E Phishing Page</title>
 </head>
-<script type="text/javascript">
+<script>
 	function setIframeSource() {
 		const urlSearchParams = new URLSearchParams(window.location.search);
 		const params = Object.fromEntries(urlSearchParams.entries());
diff --git a/test/e2e/mock-page-with-iframe/index.html b/test/e2e/tests/phishing-controller/mock-page-with-iframe/index.html
similarity index 100%
rename from test/e2e/mock-page-with-iframe/index.html
rename to test/e2e/tests/phishing-controller/mock-page-with-iframe/index.html
diff --git a/test/e2e/tests/phishing-controller/phishing-detection.spec.js b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
index 491b4726f9ad..a749ef743882 100644
--- a/test/e2e/tests/phishing-controller/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
@@ -76,7 +76,7 @@ describe('Phishing Detection', function () {
           });
         },
         dapp: true,
-        dappPaths: ['mock-page-with-iframe'],
+        dappPaths: ['./tests/phishing-controller/mock-page-with-iframe'],
         dappOptions: {
           numberOfDapps: 2,
         },
@@ -114,7 +114,9 @@ describe('Phishing Detection', function () {
           });
         },
         dapp: true,
-        dappPaths: ['mock-page-with-disallowed-iframe'],
+        dappPaths: [
+          './tests/phishing-controller/mock-page-with-disallowed-iframe',
+        ],
         dappOptions: {
           numberOfDapps: 2,
         },
@@ -263,7 +265,9 @@ describe('Phishing Detection', function () {
           });
         },
         dapp: true,
-        dappPaths: ['mock-page-with-disallowed-iframe'],
+        dappPaths: [
+          './tests/phishing-controller/mock-page-with-disallowed-iframe',
+        ],
         dappOptions: {
           numberOfDapps: 2,
         },
diff --git a/test/e2e/tests/ppom/migrate-opensea-to-blockaid-banner.spec.js b/test/e2e/tests/ppom/migrate-opensea-to-blockaid-banner.spec.js
index 340fca295b76..5639e607c46d 100644
--- a/test/e2e/tests/ppom/migrate-opensea-to-blockaid-banner.spec.js
+++ b/test/e2e/tests/ppom/migrate-opensea-to-blockaid-banner.spec.js
@@ -36,7 +36,6 @@ describe('Migrate Opensea to Blockaid Banner @no-mmi', function () {
           title: this.test.fullTitle(),
         },
         async ({ driver }) => {
-          await driver.navigate();
           await unlockWallet(driver);
           await openDapp(driver);
 
@@ -64,7 +63,6 @@ describe('Migrate Opensea to Blockaid Banner @no-mmi', function () {
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
-        await driver.navigate();
         await unlockWallet(driver);
         await openDapp(driver);
 
diff --git a/test/mocks/json-rpc-result.ts b/test/e2e/tests/ppom/mocks/json-rpc-result.ts
similarity index 100%
rename from test/mocks/json-rpc-result.ts
rename to test/e2e/tests/ppom/mocks/json-rpc-result.ts
diff --git a/test/e2e/mock-server-json-rpc.ts b/test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts
similarity index 96%
rename from test/e2e/mock-server-json-rpc.ts
rename to test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts
index d49b8d523b04..f539df033b02 100644
--- a/test/e2e/mock-server-json-rpc.ts
+++ b/test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts
@@ -1,5 +1,5 @@
 import { MockttpServer } from 'mockttp';
-import { mockJsonRpcResult } from '../mocks/json-rpc-result';
+import { mockJsonRpcResult } from './json-rpc-result';
 
 type RequestConfig = [
   method: string,
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-approval.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-approval.spec.js
index 23a62746a299..3fad82ef28a2 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-approval.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-approval.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
index 22d343e70478..4122695dfb50 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js
index 7921a6dd2385..39fb16cc4135 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
@@ -10,6 +9,7 @@ const {
   getEventPayloads,
   switchToNotificationWindow,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
 const selectedAddressWithoutPrefix = '5cfe73b6021e818b776b421b1c4db2474086a7e1';
@@ -275,7 +275,6 @@ describe('Confirmation Security Alert - Blockaid @no-mmi', function () {
       },
 
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
         await unlockWallet(driver);
         await openDapp(driver);
 
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-networks-support.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-networks-support.spec.js
index 0d6f66292342..719f8cbdc16b 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-networks-support.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-networks-support.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
@@ -8,6 +7,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 async function mockInfura(mockServer) {
   await mockServerJsonRpc(mockServer, [
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js
index c354ac738324..7525fe423a69 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   defaultGanacheOptions,
@@ -8,6 +7,7 @@ const {
   sendScreenToConfirmScreen,
   unlockWallet,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 const mockMaliciousAddress = '0x5fbdb2315678afecb367f032d93f642f64180aa3';
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js
index ce59742f6306..8f2debc7b4f2 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js
index 413946473c9f..34ede993a476 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -10,6 +9,7 @@ const {
   withFixtures,
   switchToNotificationWindow,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
diff --git a/test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js b/test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js
index 0c918eb26391..8939ad0b180e 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 
diff --git a/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.js b/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.js
index 9ff88c17f83c..3305cdbec034 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.js
@@ -70,7 +70,6 @@ describe('PPOM Blockaid Alert - Metrics @no-mmi', function () {
         testSpecificMock: mockServerCalls,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
         await unlockWallet(driver);
 
         // toggle on
diff --git a/test/e2e/tests/ppom/ppom-toggle-settings.spec.js b/test/e2e/tests/ppom/ppom-toggle-settings.spec.js
index 6ed0cc7e4d3d..55119a48eee4 100644
--- a/test/e2e/tests/ppom/ppom-toggle-settings.spec.js
+++ b/test/e2e/tests/ppom/ppom-toggle-settings.spec.js
@@ -61,7 +61,6 @@ describe('PPOM Settings @no-mmi', function () {
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
-        await driver.navigate();
         await unlockWallet(driver);
 
         await openDapp(driver);
diff --git a/test/e2e/tests/request-queuing/batch-txs-per-dapp-diff-network.spec.js b/test/e2e/tests/request-queuing/batch-txs-per-dapp-diff-network.spec.js
new file mode 100644
index 000000000000..c7321d4183e0
--- /dev/null
+++ b/test/e2e/tests/request-queuing/batch-txs-per-dapp-diff-network.spec.js
@@ -0,0 +1,168 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  largeDelayMs,
+  switchToNotificationWindow,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+describe('Request Queuing for Multiple Dapps and Txs on different networks', function () {
+  it('should batch confirmation txs for different dapps on different networks.', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp 1
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Localhost 8546',
+          css: 'p',
+        });
+
+        // Wait for the first dapp's connect confirmation to disappear
+        await driver.waitUntilXWindowHandles(2);
+
+        // TODO: Request Queuing bug when opening both dapps at the same time will have them stuck on the same network, with will be incorrect for one of them.
+        // Open Dapp Two
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        // Connect to dapp 2
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver, 4);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Dapp one send tx
+        await driver.switchToWindowWithUrl(DAPP_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+        await driver.clickElement('#sendButton');
+
+        await driver.delay(largeDelayMs);
+
+        // Dapp two send tx
+        await driver.switchToWindowWithUrl(DAPP_ONE_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+        await driver.clickElement('#sendButton');
+
+        await switchToNotificationWindow(driver, 4);
+
+        let navigationElement = await driver.findElement(
+          '.confirm-page-container-navigation',
+        );
+
+        let navigationText = await navigationElement.getText();
+
+        assert.equal(navigationText.includes('1 of 2'), true);
+
+        // Check correct network on confirm tx.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8545',
+        });
+
+        // Reject All Transactions
+        await driver.clickElement('.page-container__footer-secondary a');
+
+        await driver.clickElement({ text: 'Reject all', tag: 'button' }); // TODO: Do we want to confirm here?
+
+        // Wait for confirmation to close
+        await driver.waitUntilXWindowHandles(3);
+
+        // Wait for new confirmations queued from second dapp to open
+        await switchToNotificationWindow(driver, 4);
+
+        navigationElement = await driver.findElement(
+          '.confirm-page-container-navigation',
+        );
+
+        navigationText = await navigationElement.getText();
+
+        assert.equal(navigationText.includes('1 of 2'), true);
+
+        // Check correct network on confirm tx.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8546',
+        });
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/batch-txs-per-dapp-extra-tx.spec.js b/test/e2e/tests/request-queuing/batch-txs-per-dapp-extra-tx.spec.js
new file mode 100644
index 000000000000..994afd5b4f31
--- /dev/null
+++ b/test/e2e/tests/request-queuing/batch-txs-per-dapp-extra-tx.spec.js
@@ -0,0 +1,193 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  largeDelayMs,
+  switchToNotificationWindow,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+describe('Request Queuing for Multiple Dapps and Txs on different networks', function () {
+  it('should batch confirmation txs for different dapps on different networks adds extra tx after.', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp 1
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Localhost 8546',
+          css: 'p',
+        });
+
+        // Wait for the first dapp's connect confirmation to disappear
+        await driver.waitUntilXWindowHandles(2);
+
+        // TODO: Request Queuing bug when opening both dapps at the same time will have them stuck on the same network, with will be incorrect for one of them.
+        // Open Dapp Two
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        // Connect to dapp 2
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver, 4);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Dapp 1 send 2 tx
+        await driver.switchToWindowWithUrl(DAPP_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+        await driver.clickElement('#sendButton');
+
+        await driver.delay(largeDelayMs);
+
+        // Dapp 2 send 2 tx
+        await driver.switchToWindowWithUrl(DAPP_ONE_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+        await driver.clickElement('#sendButton');
+
+        await driver.delay(largeDelayMs);
+
+        // Dapp 1 send  1 tx
+        await driver.switchToWindowWithUrl(DAPP_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+
+        await switchToNotificationWindow(driver, 4);
+
+        let navigationElement = await driver.findElement(
+          '.confirm-page-container-navigation',
+        );
+
+        let navigationText = await navigationElement.getText();
+
+        assert.equal(navigationText.includes('1 of 2'), true);
+
+        // Check correct network on confirm tx.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8545',
+        });
+
+        // Reject All Transactions
+        await driver.clickElement('.page-container__footer-secondary a');
+
+        await driver.clickElement({ text: 'Reject all', tag: 'button' }); // TODO: Do we want to confirm here?
+
+        // Wait for confirmations to close and transactions from the second dapp to open
+        // Large delays to wait for confirmation spam opening/closing bug.
+        await driver.delay(5000);
+
+        // Wait for new confirmations queued from second dapp to open
+        await switchToNotificationWindow(driver, 4);
+
+        navigationElement = await driver.findElement(
+          '.confirm-page-container-navigation',
+        );
+
+        navigationText = await navigationElement.getText();
+
+        assert.equal(navigationText.includes('1 of 2'), true);
+
+        // Check correct network on confirm tx.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8546',
+        });
+
+        // Reject All Transactions
+        await driver.clickElement('.page-container__footer-secondary a');
+
+        await driver.clickElement({ text: 'Reject all', tag: 'button' });
+
+        // Wait for confirmation to close
+        await driver.waitUntilXWindowHandles(3);
+
+        // Wait for new confirmations queued from second dapp to open
+        await switchToNotificationWindow(driver, 4);
+
+        // Check correct network on confirm tx.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8545',
+        });
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/batch-txs-per-dapp-same-network.spec.js b/test/e2e/tests/request-queuing/batch-txs-per-dapp-same-network.spec.js
new file mode 100644
index 000000000000..d2d7cdf122c0
--- /dev/null
+++ b/test/e2e/tests/request-queuing/batch-txs-per-dapp-same-network.spec.js
@@ -0,0 +1,159 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  largeDelayMs,
+  switchToNotificationWindow,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+describe('Request Queuing for Multiple Dapps and Txs on same networks', function () {
+  it('should batch confirmation txs for different dapps on same networks ', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp 1
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Wait for the first dapp's connect confirmation to disappear
+        await driver.waitUntilXWindowHandles(2);
+
+        // TODO: Request Queuing bug when opening both dapps at the same time will have them stuck on the same network, with will be incorrect for one of them.
+        // Open Dapp Two
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        // Connect to dapp 2
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver, 4);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Dapp one send tx
+        await driver.switchToWindowWithUrl(DAPP_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+        await driver.clickElement('#sendButton');
+
+        await driver.delay(largeDelayMs);
+
+        // Dapp two send tx
+        await driver.switchToWindowWithUrl(DAPP_ONE_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+        await driver.clickElement('#sendButton');
+
+        await switchToNotificationWindow(driver, 4);
+
+        let navigationElement = await driver.findElement(
+          '.confirm-page-container-navigation',
+        );
+
+        let navigationText = await navigationElement.getText();
+
+        assert.equal(navigationText.includes('1 of 2'), true);
+
+        // Check correct network on confirm tx.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8545',
+        });
+
+        // Reject All Transactions
+        await driver.clickElement('.page-container__footer-secondary a');
+
+        await driver.clickElement({ text: 'Reject all', tag: 'button' }); // TODO: Do we want to confirm here?
+
+        // Wait for confirmation to close
+        await driver.waitUntilXWindowHandles(3);
+
+        // Wait for new confirmations queued from second dapp to open
+        await switchToNotificationWindow(driver, 4);
+
+        navigationElement = await driver.findElement(
+          '.confirm-page-container-navigation',
+        );
+
+        navigationText = await navigationElement.getText();
+
+        assert.equal(navigationText.includes('1 of 2'), true);
+
+        // Check correct network on confirm tx.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8545',
+        });
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/chain-id-check.spec.js b/test/e2e/tests/request-queuing/chain-id-check.spec.js
new file mode 100644
index 000000000000..780254295796
--- /dev/null
+++ b/test/e2e/tests/request-queuing/chain-id-check.spec.js
@@ -0,0 +1,103 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  switchToNotificationWindow,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+describe('Request Queuing', function () {
+  it('should keep chain id the same with request queuing and switching mm network with a connected site.', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        const request = JSON.stringify({
+          method: 'eth_chainId',
+        });
+
+        const firstChainIdCall = await driver.executeScript(
+          `return window.ethereum.request(${request})`,
+        );
+
+        assert.equal(firstChainIdCall, '0x539'); // 1337
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Localhost 8546',
+          css: 'p',
+        });
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        const secondChainIdCall = await driver.executeScript(
+          `return window.ethereum.request(${request})`,
+        );
+
+        assert.equal(secondChainIdCall, '0x539'); // 1337
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/chainid-check.spec.js b/test/e2e/tests/request-queuing/chainid-check.spec.js
new file mode 100644
index 000000000000..664cb1117d3c
--- /dev/null
+++ b/test/e2e/tests/request-queuing/chainid-check.spec.js
@@ -0,0 +1,134 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  switchToNotificationWindow,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+describe('Request-queue chainId proxy sync', function () {
+  it('should preserve per dapp network selections after connecting without refresh calls @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        await driver.delay(regularDelayMs);
+
+        const chainIdRequest = JSON.stringify({
+          method: 'eth_chainId',
+        });
+
+        const chainIdCheckBeforeConnect = await driver.executeScript(
+          `return window.ethereum.request(${chainIdRequest})`,
+        );
+
+        assert.equal(chainIdCheckBeforeConnect, '0x539'); // 1337
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Ethereum Mainnet',
+          css: 'p',
+        });
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        const secondChainIdCheckBeforeConnect = await driver.executeScript(
+          `return window.ethereum.request(${chainIdRequest})`,
+        );
+
+        // before connecting the chainId should change with the wallet
+        assert.equal(secondChainIdCheckBeforeConnect, '0x1');
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        const firstChainIdCallAfterConnect = await driver.executeScript(
+          `return window.ethereum.request(${chainIdRequest})`,
+        );
+
+        assert.equal(firstChainIdCallAfterConnect, '0x1');
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Localhost 8546',
+          css: 'p',
+        });
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        const secondChainIdCall = await driver.executeScript(
+          `return window.ethereum.request(${chainIdRequest})`,
+        );
+        // after connecting the dapp should now have its own selected network
+        // independent from the globally selected and therefore should not have changed
+        assert.equal(secondChainIdCall, '0x1');
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/dapp1-subscribe-network-switch.spec.js b/test/e2e/tests/request-queuing/dapp1-subscribe-network-switch.spec.js
new file mode 100644
index 000000000000..cbfb2b23a9a7
--- /dev/null
+++ b/test/e2e/tests/request-queuing/dapp1-subscribe-network-switch.spec.js
@@ -0,0 +1,105 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  switchToNotificationWindow,
+  defaultGanacheOptions,
+} = require('../../helpers');
+
+describe('Request Queueing', function () {
+  it('should keep subscription on dapp network when switching different mm network', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Wait for Connecting notification to close.
+        await driver.waitUntilXWindowHandles(2);
+
+        // Navigate to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        const subscribeRequest = JSON.stringify({
+          jsonrpc: '2.0',
+          method: 'eth_subscribe',
+          params: ['newHeads'],
+        });
+
+        const subscribe = await driver.executeScript(
+          `return window.ethereum.request(${subscribeRequest})`,
+        );
+
+        const subscriptionMessage = await driver.executeAsyncScript(
+          `const callback = arguments[arguments.length - 1];` +
+            `window.ethereum.on('message', (message) => callback(message))`,
+        );
+
+        assert.strictEqual(subscribe, subscriptionMessage.data.subscription);
+        assert.strictEqual(subscriptionMessage.type, 'eth_subscription');
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Localhost 8546',
+          css: 'p',
+        });
+
+        assert.strictEqual(subscribe, subscriptionMessage.data.subscription);
+        assert.strictEqual(subscriptionMessage.type, 'eth_subscription');
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-send.spec.js b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-send.spec.js
new file mode 100644
index 000000000000..e04ac4ab8f95
--- /dev/null
+++ b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-send.spec.js
@@ -0,0 +1,166 @@
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  switchToNotificationWindow,
+} = require('../../helpers');
+
+describe('Request Queuing Dapp 1, Switch Tx -> Dapp 2 Send Tx', function () {
+  it('should queue send tx after switch network confirmation.', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerTripleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+            {
+              port: 7777,
+              chainId: 1000,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Localhost 8546',
+          css: 'p',
+        });
+
+        // Wait for the first dapp's connect confirmation to disappear
+        await driver.waitUntilXWindowHandles(2);
+
+        // TODO: Request Queuing bug when opening both dapps at the same time will have them stuck on the same network, with will be incorrect for one of them.
+        // Open Dapp Two
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        // Connect to dapp 2
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver, 4);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithUrl(DAPP_URL);
+
+        // switchEthereumChain request
+        const switchEthereumChainRequest = JSON.stringify({
+          jsonrpc: '2.0',
+          method: 'wallet_switchEthereumChain',
+          params: [{ chainId: '0x3e8' }],
+        });
+
+        // Initiate switchEthereumChain on Dapp Two
+        await driver.executeScript(
+          `window.ethereum.request(${switchEthereumChainRequest})`,
+        );
+
+        await driver.switchToWindowWithUrl(DAPP_ONE_URL);
+
+        await driver.clickElement('#sendButton');
+
+        await switchToNotificationWindow(driver, 4);
+        await driver.findClickableElements({
+          text: 'Switch network',
+          tag: 'button',
+        });
+
+        await driver.clickElement({ text: 'Switch network', tag: 'button' });
+
+        // Wait for switch confirmation to close then tx confirmation to show.
+        await driver.waitUntilXWindowHandles(3);
+
+        await switchToNotificationWindow(driver, 4);
+
+        // Check correct network on the send confirmation.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8546',
+        });
+
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+        // Switch back to the extension
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+
+        // Check for transaction
+        await driver.wait(async () => {
+          const confirmedTxes = await driver.findElements(
+            '.transaction-list__completed-transactions .activity-list-item',
+          );
+          return confirmedTxes.length === 1;
+        }, 10000);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/enable-queuing.spec.js b/test/e2e/tests/request-queuing/enable-queuing.spec.js
index 318cefb8e36a..8bff29afa8a6 100644
--- a/test/e2e/tests/request-queuing/enable-queuing.spec.js
+++ b/test/e2e/tests/request-queuing/enable-queuing.spec.js
@@ -16,7 +16,6 @@ describe('Toggle Request Queuing Setting', function () {
         title: this.test.fullTitle(),
       },
       async ({ driver }) => {
-        await driver.navigate();
         await unlockWallet(driver);
 
         // Open account menu button
diff --git a/test/e2e/tests/request-queuing/multi-dapp-sendTx-revokePermission.spec.js b/test/e2e/tests/request-queuing/multi-dapp-sendTx-revokePermission.spec.js
new file mode 100644
index 000000000000..7821a005774d
--- /dev/null
+++ b/test/e2e/tests/request-queuing/multi-dapp-sendTx-revokePermission.spec.js
@@ -0,0 +1,140 @@
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  largeDelayMs,
+  switchToNotificationWindow,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+describe('Request Queuing for Multiple Dapps and Txs on different networks revokePermissions', function () {
+  it('should close transaction for revoked permission of eth_accounts but show queued tx from second dapp on a different network.', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp 1
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Network Selector
+        await driver.clickElement('[data-testid="network-display"]');
+
+        // Switch to second network
+        await driver.clickElement({
+          text: 'Localhost 8546',
+          css: 'p',
+        });
+
+        // Wait for the first dapp's connect confirmation to disappear
+        await driver.waitUntilXWindowHandles(2);
+
+        // TODO: Request Queuing bug when opening both dapps at the same time will have them stuck on the same network, with will be incorrect for one of them.
+        // Open Dapp Two
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        // Connect to dapp 2
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver, 4);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Dapp 1 send tx
+        await driver.switchToWindowWithUrl(DAPP_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+
+        await driver.waitUntilXWindowHandles(4);
+        await driver.delay(3000);
+
+        // Dapp 2 send tx
+        await driver.switchToWindowWithUrl(DAPP_ONE_URL);
+        await driver.delay(largeDelayMs);
+        await driver.clickElement('#sendButton');
+
+        // Dapp 1 revokePermissions
+        await driver.switchToWindowWithUrl(DAPP_URL);
+        await driver.clickElement('#revokeAccountsPermission');
+
+        // Confirmation will close then reopen
+        await driver.waitUntilXWindowHandles(3);
+
+        // Check correct network on confirm tx.
+        await switchToNotificationWindow(driver, 4);
+
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8546',
+        });
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js b/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js
index 20cd7597224b..c61a785f8e3a 100644
--- a/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js
+++ b/test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js
@@ -28,11 +28,13 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         dappOptions: { numberOfDapps: 2 },
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: {
-            port,
-            chainId,
-            ganacheOptions2: defaultGanacheOptions,
-          },
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
         },
         title: this.test.fullTitle(),
       },
@@ -45,7 +47,7 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         // Open Dapp One
         await openDapp(driver, undefined, DAPP_URL);
 
-        // Connect to dapp
+        // Connect to dapp 1
         await driver.findClickableElement({ text: 'Connect', tag: 'button' });
         await driver.clickElement('#connectButton');
 
@@ -60,7 +62,7 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         });
 
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
           css: '[data-testid="page-container-footer-next"]',
         });
@@ -85,7 +87,7 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         // Open Dapp Two
         await openDapp(driver, undefined, DAPP_ONE_URL);
 
-        // Connect to dapp
+        // Connect to dapp 2
         await driver.findClickableElement({ text: 'Connect', tag: 'button' });
         await driver.clickElement('#connectButton');
 
@@ -100,14 +102,13 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
         });
 
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
           css: '[data-testid="page-container-footer-next"]',
         });
 
         // Dapp one send tx
         await driver.switchToWindowWithUrl(DAPP_URL);
-        await driver.executeScript(`window.location.reload()`);
         await driver.delay(largeDelayMs);
         await driver.clickElement('#sendButton');
 
@@ -115,7 +116,6 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
 
         // Dapp two send tx
         await driver.switchToWindowWithUrl(DAPP_ONE_URL);
-        await driver.executeScript(`window.location.reload()`);
         await driver.delay(largeDelayMs);
         await driver.clickElement('#sendButton');
 
diff --git a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js
new file mode 100644
index 000000000000..d16a25dbd2bf
--- /dev/null
+++ b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js
@@ -0,0 +1,90 @@
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  switchToNotificationWindow,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+describe('Request Queuing', function () {
+  it('should clear tx confirmation when revokePermission is called from origin dapp', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+        },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.waitUntilXWindowHandles(2);
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        await driver.clickElement('#sendButton');
+
+        await driver.waitUntilXWindowHandles(3);
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // wallet_revokePermissions request
+        const revokePermissionsRequest = JSON.stringify({
+          jsonrpc: '2.0',
+          method: 'wallet_revokePermissions',
+          params: [
+            {
+              eth_accounts: {},
+            },
+          ],
+        });
+
+        await driver.executeScript(
+          `return window.ethereum.request(${revokePermissionsRequest})`,
+        );
+
+        // Should have cleared the tx confirmation
+        await driver.waitUntilXWindowHandles(2);
+
+        // Cleared eth_accounts account label
+        await driver.findElement({ xpath: '//span[@id="accounts"][.=""]' });
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/sendTx-switchChain-sendTx.spec.js b/test/e2e/tests/request-queuing/sendTx-switchChain-sendTx.spec.js
new file mode 100644
index 000000000000..ff8464f4e30e
--- /dev/null
+++ b/test/e2e/tests/request-queuing/sendTx-switchChain-sendTx.spec.js
@@ -0,0 +1,115 @@
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  switchToNotificationWindow,
+  defaultGanacheOptions,
+} = require('../../helpers');
+
+describe('Request Queuing Send Tx -> SwitchChain -> SendTx', function () {
+  // todo: reenable this test once this issue is resolved: https://github.com/MetaMask/MetaMask-planning/issues/2406
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should not be able to navigate batch send txs with a switch chain in the middle', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Connect',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Wait for Connecting notification to close.
+        await driver.waitUntilXWindowHandles(2);
+
+        // Navigate to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Dapp Send Button
+        await driver.clickElement('#sendButton');
+
+        // Keep notification confirmation on screen
+        await driver.waitUntilXWindowHandles(3);
+
+        // Navigate back to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Switch Ethereum Chain
+        await driver.findClickableElement('#switchEthereumChain');
+        await driver.clickElement('#switchEthereumChain');
+
+        // Navigate back to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Dapp Send Button
+        await driver.clickElement('#sendButton');
+
+        await switchToNotificationWindow(driver);
+
+        await driver.assertElementNotPresent(
+          '.confirm-page-container-navigation',
+        );
+
+        // Reject Transaction
+        await driver.findClickableElement({ text: 'Reject', tag: 'button' });
+        await driver.clickElement(
+          '[data-testid="page-container-footer-cancel"]',
+        );
+
+        // Switch Chain Next confirmation
+        await driver.findClickableElements({
+          text: 'Switch network',
+          tag: 'button',
+        });
+
+        // Confirm Switch Chain
+        await driver.clickElement({ text: 'Switch network', tag: 'button' });
+
+        // No confirmations, after switching network, tx queue should be cleared
+        await driver.waitUntilXWindowHandles(2);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/switch-network.spec.js b/test/e2e/tests/request-queuing/switch-network.spec.js
index 6bb0093d4665..e662363a3693 100644
--- a/test/e2e/tests/request-queuing/switch-network.spec.js
+++ b/test/e2e/tests/request-queuing/switch-network.spec.js
@@ -24,11 +24,13 @@ describe('Request Queuing Switch Network on Dapp Send Tx while on different netw
           .build(),
         ganacheOptions: {
           ...defaultGanacheOptions,
-          concurrent: {
-            port,
-            chainId,
-            ganacheOptions2: defaultGanacheOptions,
-          },
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
         },
         title: this.test.fullTitle(),
       },
@@ -55,7 +57,7 @@ describe('Request Queuing Switch Network on Dapp Send Tx while on different netw
         });
 
         await driver.clickElement({
-          text: 'Connect',
+          text: 'Confirm',
           tag: 'button',
           css: '[data-testid="page-container-footer-next"]',
         });
diff --git a/test/e2e/tests/request-queuing/switchChain-sendTx.spec.js b/test/e2e/tests/request-queuing/switchChain-sendTx.spec.js
new file mode 100644
index 000000000000..ffada082999b
--- /dev/null
+++ b/test/e2e/tests/request-queuing/switchChain-sendTx.spec.js
@@ -0,0 +1,103 @@
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  switchToNotificationWindow,
+  defaultGanacheOptions,
+} = require('../../helpers');
+
+describe('Request Queuing SwitchChain -> SendTx', function () {
+  it('should clear subsequent sendTxs after switching chain', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Wait for Connecting notification to close.
+        await driver.waitUntilXWindowHandles(2);
+
+        // Navigate to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Switch Ethereum Chain
+        await driver.findClickableElement('#switchEthereumChain');
+        await driver.clickElement('#switchEthereumChain');
+
+        // Keep notification confirmation on screen
+        await driver.waitUntilXWindowHandles(3);
+
+        // Navigate back to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Dapp Send Button
+        await driver.clickElement('#sendButton');
+
+        await switchToNotificationWindow(driver, 3);
+
+        // Persist Switch Ethereum Chain notifcation
+        await driver.findClickableElements({
+          text: 'Switch network',
+          tag: 'button',
+        });
+
+        // Find the cancel pending txs on the Switch Ethereum Chain notification.
+        await driver.findElement({
+          text: 'Switching networks will cancel all pending confirmations',
+          tag: 'span',
+        });
+
+        // Confirm Switch Network
+        await driver.clickElement({ text: 'Switch network', tag: 'button' });
+
+        // No confirmations, tx should be cleared
+        await driver.waitUntilXWindowHandles(2);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/switchChain-watchAsset.spec.js b/test/e2e/tests/request-queuing/switchChain-watchAsset.spec.js
new file mode 100644
index 000000000000..5e42e8b5a3ec
--- /dev/null
+++ b/test/e2e/tests/request-queuing/switchChain-watchAsset.spec.js
@@ -0,0 +1,117 @@
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  switchToNotificationWindow,
+  defaultGanacheOptions,
+  largeDelayMs,
+} = require('../../helpers');
+
+describe('Request Queue SwitchChain -> WatchAsset', function () {
+  it('should clear subsequent watchAsset after switching chain', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Wait for Connecting notification to close.
+        await driver.waitUntilXWindowHandles(2);
+
+        // Navigate to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Create Token
+        await driver.clickElement({ text: 'Create Token', tag: 'button' });
+        await switchToNotificationWindow(driver);
+        await driver.findClickableElement({ text: 'Confirm', tag: 'button' });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+        // Wait for token address to populate in dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+        await driver.wait(async () => {
+          const tokenAddressesElement = await driver.findElement(
+            '#tokenAddresses',
+          );
+          const tokenAddresses = await tokenAddressesElement.getText();
+          return tokenAddresses !== '';
+        }, 10000);
+
+        // Switch Ethereum Chain
+        await driver.findClickableElement('#switchEthereumChain');
+        await driver.clickElement('#switchEthereumChain');
+
+        await driver.waitUntilXWindowHandles(3);
+
+        // Delay needed here for firefox, not loading page of switchEthereumChain before clicking the watchAsset button
+        // will result in watchAsset being front ran in the window.
+        await driver.delay(largeDelayMs);
+
+        // Switch back to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Watch Asset
+        await driver.clickElement({
+          text: 'Add Token(s) to Wallet',
+          tag: 'button',
+        });
+
+        await switchToNotificationWindow(driver);
+
+        // Confirm Switch Network
+        await driver.findClickableElement({
+          text: 'Switch network',
+          tag: 'button',
+        });
+        await driver.clickElement({ text: 'Switch network', tag: 'button' });
+
+        await driver.waitUntilXWindowHandles(2);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js
new file mode 100644
index 000000000000..8e7ab0fadb0d
--- /dev/null
+++ b/test/e2e/tests/request-queuing/ui.spec.js
@@ -0,0 +1,139 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  switchToNotificationWindow,
+  veryLargeDelayMs,
+} = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+
+async function openDappAndSwitchChain(driver, dappUrl, chainId) {
+  const notificationWindowIndex = chainId ? 4 : 3;
+
+  // Open the dapp
+  await openDapp(driver, undefined, dappUrl);
+  await driver.delay(regularDelayMs);
+
+  // Connect to the dapp
+  await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+  await driver.clickElement('#connectButton');
+  await driver.delay(regularDelayMs);
+  await switchToNotificationWindow(driver, notificationWindowIndex);
+  await driver.clickElement({
+    text: 'Next',
+    tag: 'button',
+    css: '[data-testid="page-container-footer-next"]',
+  });
+  await driver.clickElement({
+    text: 'Confirm',
+    tag: 'button',
+    css: '[data-testid="page-container-footer-next"]',
+  });
+
+  // Switch back to the dapp
+  await driver.switchToWindowWithUrl(dappUrl);
+
+  // Switch chains if necessary
+  if (chainId) {
+    await driver.delay(veryLargeDelayMs);
+    const switchChainRequest = JSON.stringify({
+      method: 'wallet_switchEthereumChain',
+      params: [{ chainId }],
+    });
+
+    await driver.executeScript(
+      `window.ethereum.request(${switchChainRequest})`,
+    );
+
+    await driver.delay(veryLargeDelayMs);
+    await switchToNotificationWindow(driver, notificationWindowIndex);
+
+    await driver.findClickableElement(
+      '[data-testid="confirmation-submit-button"]',
+    );
+    await driver.clickElement('[data-testid="confirmation-submit-button"]');
+  }
+}
+
+async function selectDappClickSendGetNetwork(driver, dappUrl) {
+  await driver.switchToWindowWithUrl(dappUrl);
+  await driver.clickElement('#sendButton');
+  await switchToNotificationWindow(driver, 4);
+  const networkPill = await driver.findElement(
+    '[data-testid="network-display"]',
+  );
+  const networkText = await networkPill.getText();
+  await driver.clickElement({ css: 'button', text: 'Reject' });
+  return networkText;
+}
+
+describe('Request-queue UI changes', function () {
+  it('UI should show network specific to domain @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open the first dapp
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open the second dapp and switch chains
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1');
+
+        // Go to wallet fullscreen, ensure that the global network changed to Ethereum Mainnet
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Ethereum Mainnet',
+        });
+
+        // Go to the first dapp, ensure it uses localhost
+        const dappOneNetworkPillText = await selectDappClickSendGetNetwork(
+          driver,
+          DAPP_URL,
+        );
+        assert.equal(dappOneNetworkPillText, 'Localhost 8545');
+
+        // Go to the second dapp, ensure it uses Ethereum Mainnet
+        const dappTwoNetworkPillText = await selectDappClickSendGetNetwork(
+          driver,
+          DAPP_ONE_URL,
+        );
+        assert.equal(dappTwoNetworkPillText, 'Ethereum Mainnet');
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/request-queuing/watchAsset-switchChain-watchAsset.spec.js b/test/e2e/tests/request-queuing/watchAsset-switchChain-watchAsset.spec.js
new file mode 100644
index 000000000000..5eeca29532f0
--- /dev/null
+++ b/test/e2e/tests/request-queuing/watchAsset-switchChain-watchAsset.spec.js
@@ -0,0 +1,132 @@
+const { strict: assert } = require('assert');
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  switchToNotificationWindow,
+  defaultGanacheOptions,
+} = require('../../helpers');
+
+describe('Request Queue WatchAsset -> SwitchChain -> WatchAsset', function () {
+  // todo: reenable this test once this issue is resolved: https://github.com/MetaMask/MetaMask-planning/issues/2406
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should not batch subsequent watchAsset token into first watchAsset confirmation with a switchChain in the middle', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Connect',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        // Wait for Connecting notification to close.
+        await driver.waitUntilXWindowHandles(2);
+
+        // Navigate to test dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Create Token
+        await driver.clickElement({ text: 'Create Token', tag: 'button' });
+        await switchToNotificationWindow(driver);
+        await driver.findClickableElement({ text: 'Confirm', tag: 'button' });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+        // Wait for token address to populate in dapp
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+        await driver.wait(async () => {
+          const tokenAddressesElement = await driver.findElement(
+            '#tokenAddresses',
+          );
+          const tokenAddresses = await tokenAddressesElement.getText();
+          return tokenAddresses !== '';
+        }, 10000);
+
+        // Watch Asset 1st call
+        await driver.clickElement({
+          text: 'Add Token(s) to Wallet',
+          tag: 'button',
+        });
+
+        await driver.waitUntilXWindowHandles(3);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Switch Ethereum Chain
+        await driver.findClickableElement('#switchEthereumChain');
+        await driver.clickElement('#switchEthereumChain');
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Watch Asset 2nd call
+        await driver.clickElement({
+          text: 'Add Token(s) to Wallet',
+          tag: 'button',
+        });
+
+        // Wait for token to show in list of tokens to watch
+        await driver.delay(regularDelayMs);
+
+        await switchToNotificationWindow(driver);
+
+        const multipleSuggestedtokens = await driver.findElements(
+          '.confirm-add-suggested-token__token-list-item',
+        );
+
+        // Confirm only 1 token is present in suggested token list
+        assert.equal(multipleSuggestedtokens.length, 1);
+
+        await switchToNotificationWindow(driver);
+
+        await driver.clickElement({ text: 'Switch network', tag: 'button' });
+
+        await driver.waitUntilXWindowHandles(2);
+
+        /**
+         * Confirm 2nd watchAsset confirmation doesn't pop section
+         */
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/settings/change-language.spec.ts b/test/e2e/tests/settings/change-language.spec.ts
index dac24215e852..9da12b5cd515 100644
--- a/test/e2e/tests/settings/change-language.spec.ts
+++ b/test/e2e/tests/settings/change-language.spec.ts
@@ -28,7 +28,7 @@ const selectors = {
   headerText: { text: 'الإعدادات', tag: 'h3' },
 };
 
-async function changeLanguage(driver: Driver , languageIndex: number) {
+async function changeLanguage(driver: Driver, languageIndex: number) {
   await driver.clickElement(selectors.accountOptionsMenuButton);
   await driver.clickElement(selectors.settingsOption);
 
@@ -91,7 +91,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
 
       async ({ driver }: { driver: Driver }) => {
         await unlockWallet(driver);
-        await changeLanguage(driver, languageIndex );
+        await changeLanguage(driver, languageIndex);
 
         await driver.assertElementNotPresent('.loading-overlay__spinner');
 
@@ -134,7 +134,6 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
     if (process.env.MULTICHAIN) {
       return;
     }
-
     const languageIndex = 7;
     await withFixtures(
       {
@@ -145,7 +144,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
 
       async ({ driver }: { driver: Driver }) => {
         await unlockWallet(driver);
-        await changeLanguage( driver, languageIndex );
+        await changeLanguage(driver, languageIndex);
         await driver.navigate();
         await driver.clickElement(selectors.ethOverviewSend);
         await driver.fill(selectors.ensInput, 'test');
@@ -167,7 +166,6 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
     if (process.env.MULTICHAIN) {
       return;
     }
-
     const languageIndex = 19;
     await withFixtures(
       {
@@ -178,7 +176,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
 
       async ({ driver }: { driver: Driver }) => {
         await unlockWallet(driver);
-        await changeLanguage( driver, languageIndex );
+        await changeLanguage(driver, languageIndex);
         await driver.navigate();
 
         // Validate the account tooltip
@@ -216,7 +214,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
       async ({ driver }: { driver: Driver }) => {
         await unlockWallet(driver);
         // selects "Magyar" language
-        await changeLanguage( driver, languageIndex );
+        await changeLanguage(driver, languageIndex);
         await driver.navigate();
         await driver.clickElement(selectors.nftsTab);
 
@@ -243,7 +241,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
       },
       async ({ driver }: { driver: Driver }) => {
         await unlockWallet(driver);
-        await changeLanguage( driver, languageIndex );
+        await changeLanguage(driver, languageIndex);
 
         // Validate the header text
         const isHeaderTextChanged = await driver.isElementPresent(
diff --git a/test/e2e/tests/localization.spec.js b/test/e2e/tests/settings/localization.spec.js
similarity index 92%
rename from test/e2e/tests/localization.spec.js
rename to test/e2e/tests/settings/localization.spec.js
index 7c8c35d3d169..707cc120e578 100644
--- a/test/e2e/tests/localization.spec.js
+++ b/test/e2e/tests/settings/localization.spec.js
@@ -3,8 +3,8 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Localization', function () {
   it('can correctly display Philippine peso symbol and code', async function () {
diff --git a/test/e2e/tests/settings-security-reveal-srp.spec.js b/test/e2e/tests/settings/settings-security-reveal-srp.spec.js
similarity index 96%
rename from test/e2e/tests/settings-security-reveal-srp.spec.js
rename to test/e2e/tests/settings/settings-security-reveal-srp.spec.js
index 59affd6f4bf7..f99e606fb815 100644
--- a/test/e2e/tests/settings-security-reveal-srp.spec.js
+++ b/test/e2e/tests/settings/settings-security-reveal-srp.spec.js
@@ -5,9 +5,9 @@ const {
   completeSRPRevealQuiz,
   tapAndHoldToRevealSRP,
   closeSRPReveal,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const { tEn } = require('../../lib/i18n-helpers');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const { tEn } = require('../../../lib/i18n-helpers');
 
 describe('Reveal SRP through settings', function () {
   const testPassword = 'correct horse battery staple';
diff --git a/test/e2e/tests/terms-of-use.spec.js b/test/e2e/tests/settings/terms-of-use.spec.js
similarity index 93%
rename from test/e2e/tests/terms-of-use.spec.js
rename to test/e2e/tests/settings/terms-of-use.spec.js
index 842f7135b179..87c2c2d0018d 100644
--- a/test/e2e/tests/terms-of-use.spec.js
+++ b/test/e2e/tests/settings/terms-of-use.spec.js
@@ -3,8 +3,8 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Terms of use', function () {
   it('accepts the updated terms of use @no-mmi', async function () {
diff --git a/test/e2e/tests/signature/signature-request.spec.js b/test/e2e/tests/signature/signature-request.spec.js
index 9f12785ed704..18a51378d04e 100644
--- a/test/e2e/tests/signature/signature-request.spec.js
+++ b/test/e2e/tests/signature/signature-request.spec.js
@@ -28,6 +28,8 @@ const testData = [
       originClass: '.request-signature__origin',
       messageClass: '.request-signature__row-value',
     },
+    verifyRejectionResultId: '#signTypedDataResult',
+    rejectSignatureMessage: 'Error: User rejected the request.',
   },
   {
     type: signatureRequestType.signTypedDataV3,
@@ -40,6 +42,8 @@ const testData = [
       originClass: '.signature-request__origin',
       messageClass: '.signature-request-data__node__value',
     },
+    verifyRejectionResultId: '#signTypedDataV3Result',
+    rejectSignatureMessage: 'Error: User rejected the request.',
   },
   {
     type: signatureRequestType.signTypedDataV4,
@@ -52,6 +56,8 @@ const testData = [
       originClass: '.signature-request__origin',
       messageClass: '.signature-request-data__node__value',
     },
+    verifyRejectionResultId: '#signTypedDataV4Result',
+    rejectSignatureMessage: 'Error: User rejected the request.',
   },
 ];
 
@@ -94,10 +100,11 @@ describe('Sign Typed Data Signature Request', function () {
           );
 
           // Approve signing typed data
-          await approveSignatureRequest(
+          await finalizeSignatureRequest(
             driver,
             data.type,
             '[data-testid="signature-request-scroll-button"]',
+            'Sign',
           );
           await driver.waitUntilXWindowHandles(2);
           windowHandles = await driver.getAllWindowHandles();
@@ -163,18 +170,20 @@ describe('Sign Typed Data Signature Request', function () {
           );
 
           // approve first signature request
-          await approveSignatureRequest(
+          await finalizeSignatureRequest(
             driver,
             data.type,
             '[data-testid="signature-request-scroll-button"]',
+            'Sign',
           );
           await driver.waitUntilXWindowHandles(3);
 
           // approve second signature request
-          await approveSignatureRequest(
+          await finalizeSignatureRequest(
             driver,
             data.type,
             '[data-testid="signature-request-scroll-button"]',
+            'Sign',
           );
           await driver.waitUntilXWindowHandles(2);
 
@@ -189,6 +198,125 @@ describe('Sign Typed Data Signature Request', function () {
       );
     });
   });
+
+  testData.forEach((data) => {
+    it(`can initiate and reject a Signature Request of ${data.type}`, async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement(data.buttonId);
+
+          await driver.waitUntilXWindowHandles(3);
+          let windowHandles = await driver.getAllWindowHandles();
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+
+          // Reject signing typed data
+          await finalizeSignatureRequest(
+            driver,
+            data.type,
+            '[data-testid="signature-request-scroll-button"]',
+            'Reject',
+          );
+          await driver.waitUntilXWindowHandles(2);
+          windowHandles = await driver.getAllWindowHandles();
+
+          // switch to the Dapp and verify the rejection was successful
+          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+          const rejectionResult = await driver.findElement(
+            data.verifyRejectionResultId,
+          );
+
+          assert.equal(
+            await rejectionResult.getText(),
+            data.rejectSignatureMessage,
+          );
+        },
+      );
+    });
+  });
+
+  testData.forEach((data) => {
+    it(`can queue multiple Signature Requests of ${data.type} and reject`, async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await openDapp(driver);
+
+          // creates multiple sign typed data signature requests
+          await driver.clickElement(data.buttonId);
+
+          await driver.waitUntilXWindowHandles(3);
+          const windowHandles = await driver.getAllWindowHandles();
+          // switches to Dapp
+          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+          // creates second sign typed data signature request
+          await driver.clickElement(data.buttonId);
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+
+          await driver.waitForSelector({
+            text: 'Reject 2 requests',
+            tag: 'button',
+          });
+
+          // reject first signature request
+          await finalizeSignatureRequest(
+            driver,
+            data.type,
+            '[data-testid="signature-request-scroll-button"]',
+            'Reject',
+          );
+          await driver.waitUntilXWindowHandles(3);
+
+          // reject second signature request
+          await finalizeSignatureRequest(
+            driver,
+            data.type,
+            '[data-testid="signature-request-scroll-button"]',
+            'Reject',
+          );
+          await driver.waitUntilXWindowHandles(2);
+
+          // switch to the Dapp and verify the rejection was successful
+          await driver.switchToWindowWithTitle('E2E Test Dapp');
+          const rejectionResult = await driver.findElement(
+            data.verifyRejectionResultId,
+          );
+          assert.equal(
+            await rejectionResult.getText(),
+            data.rejectSignatureMessage,
+          );
+        },
+      );
+    });
+  });
 });
 
 async function verifyAndAssertSignTypedData(
@@ -219,11 +347,11 @@ async function verifyAndAssertSignTypedData(
   assert.equal(await messages[messageNumber].getText(), expectedMessage);
 }
 
-async function approveSignatureRequest(driver, type, buttonElementId) {
+async function finalizeSignatureRequest(driver, type, buttonElementId, action) {
   if (type !== signatureRequestType.signTypedData) {
     await driver.delay(regularDelayMs);
     await driver.clickElement(buttonElementId);
   }
   await driver.delay(regularDelayMs);
-  await driver.clickElement({ text: 'Sign', tag: 'button' });
+  await driver.clickElement({ text: action, tag: 'button' });
 }
diff --git a/test/e2e/tests/simulation-details/simulation-details.spec.ts b/test/e2e/tests/simulation-details/simulation-details.spec.ts
index 0c3e514f88ad..65e21b5d9ab2 100644
--- a/test/e2e/tests/simulation-details/simulation-details.spec.ts
+++ b/test/e2e/tests/simulation-details/simulation-details.spec.ts
@@ -114,7 +114,7 @@ describe('Simulation Details', () => {
 
       await switchToNotificationWindow(driver);
       await expectBalanceChange(driver, true, 0, '- 0.002', 'ETH');
-      await expectBalanceChange(driver, false, 0, '+ 6.756291', 'DAI');
+      await expectBalanceChange(driver, false, 0, '+ 6.756', 'DAI');
     });
   });
 
diff --git a/test/e2e/synchronous-injection/index.html b/test/e2e/tests/synchronous-injection/index.html
similarity index 100%
rename from test/e2e/synchronous-injection/index.html
rename to test/e2e/tests/synchronous-injection/index.html
diff --git a/test/e2e/synchronous-injection/synchronous-injection.spec.js b/test/e2e/tests/synchronous-injection/synchronous-injection.spec.js
similarity index 83%
rename from test/e2e/synchronous-injection/synchronous-injection.spec.js
rename to test/e2e/tests/synchronous-injection/synchronous-injection.spec.js
index 95b2eb3fe95a..917e289f320f 100644
--- a/test/e2e/synchronous-injection/synchronous-injection.spec.js
+++ b/test/e2e/tests/synchronous-injection/synchronous-injection.spec.js
@@ -1,7 +1,7 @@
 const { strict: assert } = require('assert');
-const { withFixtures, unlockWallet, openDapp } = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const createStaticServer = require('../../../development/create-static-server');
+const { withFixtures, unlockWallet, openDapp } = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const createStaticServer = require('../../../../development/create-static-server');
 
 const dappPort = 8080;
 
@@ -20,7 +20,6 @@ describe('The provider', function () {
         title: this.test.title,
       },
       async ({ driver }) => {
-        await driver.navigate();
         await unlockWallet(driver);
         await openDapp(driver);
 
diff --git a/test/e2e/tests/tokens/custom-token-add-approve.spec.js b/test/e2e/tests/tokens/custom-token-add-approve.spec.js
index e0ee199b6ac9..d68428d7f4d1 100644
--- a/test/e2e/tests/tokens/custom-token-add-approve.spec.js
+++ b/test/e2e/tests/tokens/custom-token-add-approve.spec.js
@@ -5,7 +5,7 @@ const {
   withFixtures,
   openDapp,
   unlockWallet,
-  editGasfeeForm,
+  editGasFeeForm,
   WINDOW_TITLES,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
@@ -268,7 +268,7 @@ describe('Create token, approve token and approve token without gas', function (
           tag: 'header',
         });
 
-        await editGasfeeForm(driver, '60001', '10');
+        await editGasFeeForm(driver, '60001', '10');
 
         await driver.waitForSelector(
           {
diff --git a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
index 3b39bfddf538..70b68ba5df48 100644
--- a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
+++ b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
@@ -5,7 +5,7 @@ const {
   switchToNotificationWindow,
   openDapp,
   unlockWallet,
-  editGasfeeForm,
+  editGasFeeForm,
   WINDOW_TITLES,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
@@ -83,7 +83,7 @@ describe('Transfer custom tokens @no-mmi', function () {
         // edit gas fee
         await driver.clickElement({ text: 'Details', tag: 'button' });
         await driver.clickElement({ text: 'Edit', tag: 'button' });
-        await editGasfeeForm(driver, '60000', '10');
+        await editGasFeeForm(driver, '60000', '10');
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
 
         // check that transaction has completed correctly and is displayed in the activity list
@@ -128,7 +128,7 @@ describe('Transfer custom tokens @no-mmi', function () {
 
         // edit gas fee
         await driver.clickElement({ text: 'Edit', tag: 'button' });
-        await editGasfeeForm(driver, '60000', '10');
+        await editGasFeeForm(driver, '60000', '10');
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
 
         // in extension, check that transaction has completed correctly and is displayed in the activity list
diff --git a/test/e2e/tests/tokens/nft/auto-detect-nft.spec.js b/test/e2e/tests/tokens/nft/auto-detect-nft.spec.js
index 3fd9e4215226..1e941f9bb464 100644
--- a/test/e2e/tests/tokens/nft/auto-detect-nft.spec.js
+++ b/test/e2e/tests/tokens/nft/auto-detect-nft.spec.js
@@ -1,21 +1,21 @@
 const { strict: assert } = require('assert');
 const {
+  withFixtures,
   defaultGanacheOptions,
   unlockWallet,
-  withFixtures,
 } = require('../../../helpers');
 const FixtureBuilder = require('../../../fixture-builder');
 const { setupAutoDetectMocking } = require('./mocks');
 
 describe('NFT detection', function () {
+  /**
+   * TODO Revisit this test once we enable nft auto detection by default. Use .withPreferencesControllerNftDetectionEnabled().
+   */
   it('displays NFT media', async function () {
     const driverOptions = { mock: true };
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPreferencesControllerNftDetectionEnabled()
-          .build(),
+        fixtures: new FixtureBuilder().withNetworkControllerOnMainnet().build(),
         driverOptions,
         ganacheOptions: defaultGanacheOptions,
         title: this.test.fullTitle(),
@@ -23,7 +23,23 @@ describe('NFT detection', function () {
       },
       async ({ driver }) => {
         await unlockWallet(driver);
+
+        // go to settings
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'Settings', tag: 'div' });
+        await driver.clickElement({ text: 'Security & privacy', tag: 'div' });
+        await driver.clickElement(
+          '[data-testid="useNftDetection"] .toggle-button > div',
+        );
+        await driver.clickElement(
+          '.settings-page__header__title-container__close-button',
+        );
+        await driver.clickElement('[data-testid="home__asset-tab"]');
+
         await driver.clickElement('[data-testid="home__nfts-tab"]');
+        await driver.delay(1000);
         const collection = await driver.findElement(
           '[data-testid="collection-expander-button"]',
         );
diff --git a/test/e2e/tests/tokens/nft/mocks.js b/test/e2e/tests/tokens/nft/mocks.js
index e9909541d1db..5136b99373f6 100644
--- a/test/e2e/tests/tokens/nft/mocks.js
+++ b/test/e2e/tests/tokens/nft/mocks.js
@@ -1,65 +1,378 @@
-function setupAutoDetectMocking(server) {
+function setupAutoDetectMocking(
+  server,
+  testAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+) {
   const nfts = {
-    nfts: [
+    tokens: [
       {
-        identifier:
-          '86818186862637897590416402377730948900221574858925543698968316530334305793541',
-        collection: 'ens',
-        contract: '0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85',
-        token_standard: 'erc721',
-        name: 'peteryinusa.eth',
-        description: 'peteryinusa.eth, an ENS name.',
-        image_url: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
-        metadata_url:
-          'https://metadata.ens.domains/mainnet/0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85/86818186862637897590416402377730948900221574858925543698968316530334305793541',
-        opensea_url:
-          'https://opensea.io/assets/ethereum/0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85/86818186862637897590416402377730948900221574858925543698968316530334305793541',
-        created_at: ' ',
-        updated_at: '2022-07-02T19:30:43.023572',
-        is_disabled: false,
-        is_nsfw: false,
+        token: {
+          chainId: 1,
+          contract: '0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85',
+          tokenId:
+            '15045599024596508941101550399035548037687903197647023388282056880789326977958',
+          kind: 'erc721',
+          name: '959555.eth',
+          image: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
+          imageSmall:
+            'https://img.reservoir.tools/images/v2/mainnet/28SsxFrHoAzyiyUIVmrVwlczOlntRxQAii%2B%2F%2BYY7DijjjuiqO6zAjmtHp7iBI3QVnN3esZGCdUn46Xw0Rd4g6Uwm%2BgVVgHquI3sR%2FQkm1Lo%3D?width=250',
+          imageLarge:
+            'https://img.reservoir.tools/images/v2/mainnet/28SsxFrHoAzyiyUIVmrVwlczOlntRxQAii%2B%2F%2BYY7DijjjuiqO6zAjmtHp7iBI3QVnN3esZGCdUn46Xw0Rd4g6Uwm%2BgVVgHquI3sR%2FQkm1Lo%3D?width=1000',
+          description: '959555.eth, an ENS name.',
+          rarityScore: null,
+          rarityRank: null,
+          supply: '1',
+          remainingSupply: '1',
+          media: null,
+          isFlagged: false,
+          isSpam: false,
+          isNsfw: false,
+          metadataDisabled: false,
+          lastFlagUpdate: null,
+          lastFlagChange: null,
+          collection: {
+            id: '0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85',
+            name: 'ENS: Ethereum Name Service',
+            slug: 'ens',
+            symbol: null,
+            imageUrl: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
+            isSpam: false,
+            isNsfw: false,
+            metadataDisabled: false,
+            openseaVerificationStatus: 'verified',
+            magicedenVerificationStatus: null,
+            floorAskPrice: {
+              currency: {
+                contract: '0x0000000000000000000000000000000000000000',
+                name: 'Ether',
+                symbol: 'ETH',
+                decimals: 18,
+              },
+              amount: {
+                raw: '890000000000000',
+                decimal: 0.00089,
+                usd: 2.65981,
+                native: 0.00089,
+              },
+            },
+            royaltiesBps: 0,
+            royalties: [],
+          },
+          lastSale: {
+            orderSource: null,
+            fillSource: null,
+            timestamp: 1713213803,
+            price: {
+              currency: {
+                contract: '0x0000000000000000000000000000000000000000',
+                name: 'Ether',
+                symbol: 'ETH',
+                decimals: 18,
+              },
+              amount: {
+                raw: '1300000000000000',
+                decimal: 0.0013,
+                usd: 4.10499,
+                native: 0.0013,
+              },
+              netAmount: {
+                raw: '1287000000000000',
+                decimal: 0.00129,
+                usd: 4.06394,
+                native: 0.00129,
+              },
+            },
+            marketplaceFeeBps: 100,
+            paidFullRoyalty: false,
+            feeBreakdown: [
+              {
+                kind: 'marketplace',
+                bps: 100,
+                recipient: '0xe89b80d335a643495cfcf004037a381565edc130',
+                rawAmount: '13000000000000',
+                source: 'godid.io',
+              },
+            ],
+          },
+          lastAppraisalValue: 0.0013,
+          attributes: [
+            {
+              key: 'Length',
+              kind: 'number',
+              value: '6',
+              tokenCount: 305772,
+              onSaleCount: 8506,
+              floorAskPrice: {
+                currency: {
+                  contract: '0x0000000000000000000000000000000000000000',
+                  name: 'Ether',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                amount: {
+                  raw: '400000000000000',
+                  decimal: 0.0004,
+                  usd: 1.19542,
+                  native: 0.0004,
+                },
+              },
+              topBidValue: null,
+              createdAt: '2023-03-14T20:09:40.432Z',
+            },
+            {
+              key: 'Segment Length',
+              kind: 'number',
+              value: '6',
+              tokenCount: 247284,
+              onSaleCount: 6697,
+              floorAskPrice: {
+                currency: {
+                  contract: '0x0000000000000000000000000000000000000000',
+                  name: 'Ether',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                amount: {
+                  raw: '400000000000000',
+                  decimal: 0.0004,
+                  usd: 1.19542,
+                  native: 0.0004,
+                },
+              },
+              topBidValue: null,
+              createdAt: '2023-03-14T20:09:39.928Z',
+            },
+            {
+              key: 'Character Set',
+              kind: 'string',
+              value: 'digit',
+              tokenCount: 263793,
+              onSaleCount: 5696,
+              floorAskPrice: {
+                currency: {
+                  contract: '0x0000000000000000000000000000000000000000',
+                  name: 'Ether',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                amount: {
+                  raw: '100000000000000',
+                  decimal: 0.0001,
+                  usd: 0.29885,
+                  native: 0.0001,
+                },
+              },
+              topBidValue: null,
+              createdAt: '2023-03-14T20:09:40.046Z',
+            },
+            {
+              key: 'Registration Date',
+              kind: 'number',
+              value: '1652439936',
+              tokenCount: 1,
+              onSaleCount: 1,
+              floorAskPrice: {
+                currency: {
+                  contract: '0x0000000000000000000000000000000000000000',
+                  name: 'Ether',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                amount: {
+                  raw: '890000000000000',
+                  decimal: 0.00089,
+                  usd: 2.65981,
+                  native: 0.00089,
+                },
+              },
+              topBidValue: null,
+              createdAt: '2023-03-14T20:09:40.300Z',
+            },
+            {
+              key: 'Created Date',
+              kind: 'number',
+              value: '1652439936',
+              tokenCount: 1,
+              onSaleCount: 1,
+              floorAskPrice: {
+                currency: {
+                  contract: '0x0000000000000000000000000000000000000000',
+                  name: 'Ether',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                amount: {
+                  raw: '890000000000000',
+                  decimal: 0.00089,
+                  usd: 2.65981,
+                  native: 0.00089,
+                },
+              },
+              topBidValue: null,
+              createdAt: '2023-03-14T20:09:40.590Z',
+            },
+            {
+              key: 'Expiration Date',
+              kind: 'number',
+              value: '1715553840',
+              tokenCount: 1,
+              onSaleCount: 1,
+              floorAskPrice: {
+                currency: {
+                  contract: '0x0000000000000000000000000000000000000000',
+                  name: 'Ether',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                amount: {
+                  raw: '890000000000000',
+                  decimal: 0.00089,
+                  usd: 2.65981,
+                  native: 0.00089,
+                },
+              },
+              topBidValue: null,
+              createdAt: '2023-03-14T20:09:40.725Z',
+            },
+          ],
+          isPhishingDetected: false,
+        },
+        ownership: {
+          tokenCount: '1',
+          onSaleCount: '1',
+          floorAsk: {
+            id: '0xbd11f7221351248cbdc4ddd94248fd049a1e49d56697a41a7487a633514dd560',
+            price: {
+              currency: {
+                contract: '0x0000000000000000000000000000000000000000',
+                name: 'Ether',
+                symbol: 'ETH',
+                decimals: 18,
+              },
+              amount: {
+                raw: '890000000000000',
+                decimal: 0.00089,
+                usd: 2.65981,
+                native: 0.00089,
+              },
+            },
+            maker: '0xb7f3b75088751ae686143827be4d043b91e75855',
+            kind: 'seaport-v1.6',
+            validFrom: 1714726545,
+            validUntil: 1730278528,
+            source: {
+              id: '0xeb69aa96c4065e69cf04511c8b671906a24e8bae',
+              domain: 'okx.com',
+              name: 'okx.com',
+              icon: 'https://static.coinall.ltd/cdn/assets/imgs/226/EB771F0EE8994DD5.png',
+            },
+          },
+          acquiredAt: '2024-05-03T08:35:11.000Z',
+        },
       },
     ],
   };
 
-  const nftContract = {
-    address: '0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85',
-    chain: 'ethereum',
-    collection: 'ens',
-    contract_standard: 'erc721',
-    name: 'Unidentified contract',
-    supply: 0,
-  };
-
-  const nftCollection = {
-    collection: 'ens',
-    name: 'ENS: Ethereum Name Service',
-    description:
-      'Ethereum Name Service (ENS) domains are secure domain names for the decentralized world. ENS domains provide a way for users to map human readable names to blockchain and non-blockchain resources, like Ethereum addresses, IPFS hashes, or website URLs. ENS domains can be bought and sold on secondary markets.',
-    image_url: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
-    banner_image_url: '',
-    owner: '0xfe89cc7abb2c4183683ab71653c4cdc9b02d44b7',
-    safelist_status: 'verified',
-    category: 'domain-names',
-    is_disabled: false,
-    is_nsfw: false,
-    trait_offers_enabled: false,
-    collection_offers_enabled: false,
-    opensea_url: 'https://opensea.io/collection/ens',
-    project_url: 'https://ens.domains',
-    wiki_url: '',
-    discord_url: '',
-    telegram_url: '',
-    twitter_username: 'ensdomains',
-    instagram_username: '',
+  const ensTokenResponse = {
+    tokens: [
+      {
+        token: {
+          chainId: 1,
+          contract: '0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85',
+          tokenId:
+            '15045599024596508941101550399035548037687903197647023388282056880789326977958',
+          name: '959555.eth',
+          description: '959555.eth, an ENS name.',
+          image:
+            'https://img.reservoir.tools/images/v2/mainnet/28SsxFrHoAzyiyUIVmrVwlczOlntRxQAii%2B%2F%2BYY7DijjjuiqO6zAjmtHp7iBI3QVnN3esZGCdUn46Xw0Rd4g6Uwm%2BgVVgHquI3sR%2FQkm1Lo%3D?width=512',
+          imageSmall:
+            'https://img.reservoir.tools/images/v2/mainnet/28SsxFrHoAzyiyUIVmrVwlczOlntRxQAii%2B%2F%2BYY7DijjjuiqO6zAjmtHp7iBI3QVnN3esZGCdUn46Xw0Rd4g6Uwm%2BgVVgHquI3sR%2FQkm1Lo%3D?width=250',
+          imageLarge:
+            'https://img.reservoir.tools/images/v2/mainnet/28SsxFrHoAzyiyUIVmrVwlczOlntRxQAii%2B%2F%2BYY7DijjjuiqO6zAjmtHp7iBI3QVnN3esZGCdUn46Xw0Rd4g6Uwm%2BgVVgHquI3sR%2FQkm1Lo%3D?width=1000',
+          media: null,
+          kind: 'erc721',
+          isFlagged: false,
+          isSpam: false,
+          isNsfw: false,
+          metadataDisabled: false,
+          lastFlagUpdate: '2023-03-15T03:40:28.454Z',
+          lastFlagChange: null,
+          supply: '1',
+          remainingSupply: '1',
+          rarity: null,
+          rarityRank: null,
+          collection: {
+            id: '0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85',
+            name: 'ENS: Ethereum Name Service',
+            image:
+              'https://img.reservoir.tools/images/v2/mainnet/z9JRSpLYGu7%2BCZoKWtAuAHy3YUobqfIRYI750yAWjXOaC3JtQoWDX7cxeYedXo5C8Xjhbxx62jWX%2FlM%2BYhmjb9niMantANf9%2F%2Bi5qEitHoTNuuDbYNNFwncl9jWtDxCl5u7GPWVoM1NOhpvVvnm6hW5Yy6FCf5NBMyjnNlw%2FAr5ENFEwUlYqlx07YuUsHP%2F1?width=250',
+            slug: 'ens',
+            symbol: null,
+            creator: '0x4fe4e666be5752f1fdd210f4ab5de2cc26e3e0e8',
+            tokenCount: 3306686,
+            metadataDisabled: false,
+            floorAskPrice: {
+              currency: {
+                contract: '0x0000000000000000000000000000000000000000',
+                name: 'Ether',
+                symbol: 'ETH',
+                decimals: 18,
+              },
+              amount: {
+                raw: '890000000000000',
+                decimal: 0.00089,
+                usd: 2.65981,
+                native: 0.00089,
+              },
+            },
+          },
+          owner: '0xb7f3b75088751ae686143827be4d043b91e75855',
+          decimals: null,
+          mintStages: [],
+          isPhishingDetected: false,
+        },
+        market: {
+          floorAsk: {
+            id: '0xbd11f7221351248cbdc4ddd94248fd049a1e49d56697a41a7487a633514dd560',
+            price: {
+              currency: {
+                contract: '0x0000000000000000000000000000000000000000',
+                name: 'Ether',
+                symbol: 'ETH',
+                decimals: 18,
+              },
+              amount: {
+                raw: '890000000000000',
+                decimal: 0.00089,
+                usd: 2.65981,
+                native: 0.00089,
+              },
+            },
+            maker: '0xb7f3b75088751ae686143827be4d043b91e75855',
+            validFrom: 1714726545,
+            validUntil: 1730278528,
+            source: {
+              id: '0xeb69aa96c4065e69cf04511c8b671906a24e8bae',
+              domain: 'okx.com',
+              name: 'okx.com',
+              icon: 'https://static.coinall.ltd/cdn/assets/imgs/226/EB771F0EE8994DD5.png',
+            },
+          },
+        },
+        updatedAt: '2024-05-03T08:56:30.923Z',
+      },
+    ],
+    continuation: null,
   };
 
   // Get assets for account
   server
-    .forGet(
-      'https://proxy.metafi.codefi.network/opensea/v1/api/v2/chain/ethereum/account/0x5cfe73b6021e818b776b421b1c4db2474086a7e1/nfts',
-    )
-    .withQuery({ limit: 200, next: '' })
+    .forGet(`https://nft.api.cx.metamask.io/users/${testAddress}/tokens`)
+    .withQuery({
+      limit: 50,
+      includeTopBid: true,
+      chainIds: '1',
+      continuation: '',
+    })
     .thenCallback(() => {
       return {
         statusCode: 200,
@@ -68,26 +381,22 @@ function setupAutoDetectMocking(server) {
     });
 
   // Get contract
+  const ENS_ADDRESS = '0x57f1887a8bf19b14fc0df6fd9b2acc9af147ea85';
+  const ENS_ID =
+    '15045599024596508941101550399035548037687903197647023388282056880789326977958';
   server
-    .forGet(
-      'https://proxy.metafi.codefi.network/opensea/v1/api/v2/chain/ethereum/contract/0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85',
-    )
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: nftContract,
-      };
-    });
-
-  // Get collection
-  server
-    .forGet(
-      'https://proxy.metafi.codefi.network/opensea/v1/api/v2/collections/ens',
-    )
+    .forGet('https://nft.api.cx.metamask.io/tokens')
+    .withQuery({
+      chainIds: '1',
+      tokens: `${ENS_ADDRESS}:${ENS_ID}`,
+      includeTopBid: 'true',
+      includeAttributes: 'true',
+      includeLastSale: 'true',
+    })
     .thenCallback(() => {
       return {
         statusCode: 200,
-        json: nftCollection,
+        json: ensTokenResponse,
       };
     });
 
diff --git a/test/e2e/tests/tokens/nft/remove-nft.spec.js b/test/e2e/tests/tokens/nft/remove-nft.spec.js
index 16dad20de072..7d54df845ba8 100644
--- a/test/e2e/tests/tokens/nft/remove-nft.spec.js
+++ b/test/e2e/tests/tokens/nft/remove-nft.spec.js
@@ -3,25 +3,57 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
+  getEventPayloads,
 } = require('../../../helpers');
 const { SMART_CONTRACTS } = require('../../../seeder/smart-contracts');
 const FixtureBuilder = require('../../../fixture-builder');
+const {
+  MetaMetricsEventName,
+} = require('../../../../../shared/constants/metametrics');
+const { CHAIN_IDS } = require('../../../../../shared/constants/network');
+
+async function mockedNftRemoved(mockServer) {
+  return await mockServer
+    .forPost('https://api.segment.io/v1/batch')
+    .withJsonBodyIncluding({
+      batch: [{ type: 'track', event: MetaMetricsEventName.NFTRemoved }],
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+      };
+    });
+}
 
 describe('Remove NFT', function () {
   const smartContract = SMART_CONTRACTS.NFTS;
 
-  it('user should be able to remove ERC721 NFT on details page', async function () {
+  it('user should be able to remove ERC721 NFT on details page and removeNft event should be emitted', async function () {
+    async function mockSegment(mockServer) {
+      return [await mockedNftRemoved(mockServer)];
+    }
     await withFixtures(
       {
         dapp: true,
-        fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+        fixtures: new FixtureBuilder()
+          .withNftControllerERC721()
+          .withMetaMetricsController({
+            metaMetricsId: 'fake-metrics-id',
+            participateInMetaMetrics: true,
+          })
+          .build(),
         ganacheOptions: defaultGanacheOptions,
         smartContract,
         title: this.test.fullTitle(),
+        testSpecificMock: mockSegment,
       },
-      async ({ driver }) => {
+      async ({ driver, mockedEndpoint: mockedEndpoints, contractRegistry }) => {
         await unlockWallet(driver);
 
+        const contractAddress = await contractRegistry.getContractAddress(
+          smartContract,
+        );
+
         // Open the details and click remove nft button
         await driver.clickElement('[data-testid="home__nfts-tab"]');
         await driver.clickElement('.nft-item__container');
@@ -41,6 +73,20 @@ describe('Remove NFT', function () {
           text: 'No NFTs yet',
         });
         assert.equal(await noNftInfo.isDisplayed(), true);
+
+        // Check if event was emitted
+        const events = await getEventPayloads(driver, mockedEndpoints);
+        const nftRemovedProperties = events[0].properties;
+        assert.equal(
+          nftRemovedProperties.token_contract_address,
+          contractAddress,
+        );
+        assert.equal(nftRemovedProperties.tokenId, '1');
+        assert.equal(nftRemovedProperties.asset_type, 'NFT');
+        assert.equal(nftRemovedProperties.token_standard, 'ERC721');
+        assert.equal(nftRemovedProperties.token_standard, 'ERC721');
+        assert.equal(nftRemovedProperties.isSuccessful, true);
+        assert.equal(nftRemovedProperties.chain_id, CHAIN_IDS.LOCALHOST);
       },
     );
   });
diff --git a/test/e2e/tests/transaction/change-assets.spec.js b/test/e2e/tests/transaction/change-assets.spec.js
new file mode 100644
index 000000000000..7984fc1c0deb
--- /dev/null
+++ b/test/e2e/tests/transaction/change-assets.spec.js
@@ -0,0 +1,314 @@
+const {
+  defaultGanacheOptions,
+  withFixtures,
+  logInWithBalanceValidation,
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
+const { tEn } = require('../../../lib/i18n-helpers');
+
+describe('Change assets', function () {
+  if (!process.env.MULTICHAIN) {
+    return;
+  }
+
+  it('sends the correct asset when switching from native currency to NFT', async function () {
+    const smartContract = SMART_CONTRACTS.NFTS;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+        ganacheOptions: defaultGanacheOptions,
+        smartContract,
+        title: this.test.fullTitle(),
+      },
+      async ({ driver, ganacheServer }) => {
+        await logInWithBalanceValidation(driver, ganacheServer);
+
+        // Click the Send button
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        // Chose a recipient
+        await driver.clickElement('.multichain-account-list-item');
+
+        // Populate an amount, continue
+        await driver.clickElement('[data-testid="currency-input"]');
+        await driver.press('[data-testid="currency-input"]', '2');
+        await driver.clickElement({ text: 'Continue', css: 'button' });
+
+        // Validate the send amount
+        await driver.waitForSelector({
+          css: '.currency-display-component__text',
+          text: '2.000042',
+        });
+
+        // Click edit
+        await driver.clickElement(
+          '[data-testid="confirm-page-back-edit-button"]',
+        );
+
+        // Open the Amount modal
+        await driver.clickElement('.asset-picker__symbol');
+
+        // Choose an NFT instead
+        await driver.clickElement({ css: 'button', text: 'NFTs' });
+        await driver.clickElement('[data-testid="nft-default-image"]');
+
+        // Validate that an NFT is chosen in the AssetAmountPicker
+        await driver.waitForSelector({
+          css: '.asset-picker__symbol',
+          text: 'TDN',
+        });
+        await driver.waitForSelector({ css: 'p', text: '#1' });
+
+        // Click continue
+        await driver.clickElement({ text: 'Continue', css: 'button' });
+
+        // Ensure NFT is showing
+        await driver.waitForSelector(
+          '.confirm-page-container-summary__title img',
+        );
+        await driver.waitForSelector({ css: 'h3', text: 'Test Dapp NFTs #1' });
+
+        // Send it!
+        await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+        // Ensure it was sent
+        await driver.waitForSelector({
+          css: 'p',
+          text: 'Send Test Dapp NFTs #1',
+        });
+      },
+    );
+  });
+
+  it('sends the correct asset when switching from ERC20 to NFT', async function () {
+    const smartContract = SMART_CONTRACTS.NFTS;
+    const tokenContract = SMART_CONTRACTS.HST;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withTokensControllerERC20()
+          .withNftControllerERC721()
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        smartContract: [smartContract, tokenContract],
+        title: this.test.fullTitle(),
+      },
+      async ({ driver, ganacheServer }) => {
+        await logInWithBalanceValidation(driver, ganacheServer);
+
+        // Click the Send button
+        await driver.clickElement({
+          css: '[data-testid="multichain-token-list-button"] span',
+          text: 'TST',
+        });
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        // Chose a recipient
+        await driver.clickElement('.multichain-account-list-item');
+
+        // Populate an amount, continue
+        await driver.clickElement('[data-testid="currency-input"]');
+        await driver.press('[data-testid="currency-input"]', '0');
+        await driver.clickElement({ text: 'Continue', css: 'button' });
+
+        // Validate the send amount
+        await driver.waitForSelector({
+          css: '.currency-display-component__text',
+          text: '0.00008455',
+        });
+
+        // Click edit
+        await driver.clickElement(
+          '[data-testid="confirm-page-back-edit-button"]',
+        );
+
+        // Open the Amount modal
+        await driver.clickElement('.asset-picker__symbol');
+
+        // Choose an NFT instead
+        await driver.clickElement({ css: 'button', text: 'NFTs' });
+        await driver.clickElement('[data-testid="nft-default-image"]');
+
+        // Validate that an NFT is chosen in the AssetAmountPicker
+        await driver.waitForSelector({
+          css: '.asset-picker__symbol',
+          text: 'TDN',
+        });
+        await driver.waitForSelector({ css: 'p', text: '#1' });
+
+        // Click continue
+        await driver.clickElement({ text: 'Continue', css: 'button' });
+
+        // Ensure NFT is showing
+        await driver.waitForSelector(
+          '.confirm-page-container-summary__title img',
+        );
+        await driver.waitForSelector({ css: 'h3', text: 'Test Dapp NFTs #1' });
+
+        // Send it!
+        await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+        // Ensure it was sent
+        await driver.waitForSelector({
+          css: 'p',
+          text: 'Send Test Dapp NFTs #1',
+        });
+      },
+    );
+  });
+
+  it('sends the correct asset when switching from NFT to native currency', async function () {
+    const smartContract = SMART_CONTRACTS.NFTS;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+        ganacheOptions: defaultGanacheOptions,
+        smartContract,
+        title: this.test.fullTitle(),
+      },
+      async ({ driver, ganacheServer }) => {
+        await logInWithBalanceValidation(driver, ganacheServer);
+
+        // Choose the nft
+        await driver.clickElement('[data-testid="home__nfts-tab"]');
+        await driver.clickElement('[data-testid="nft-default-image"]');
+        await driver.clickElement('[data-testid="nft-send-button"]');
+
+        // Chose a recipient
+        await driver.clickElement('.multichain-account-list-item');
+
+        // Validate that an NFT is chosen in the AssetAmountPicker
+        await driver.waitForSelector({
+          css: '.asset-picker__symbol',
+          text: 'TDN',
+        });
+        await driver.waitForSelector({ css: 'p', text: '#1' });
+        await driver.clickElement({ text: 'Continue', css: 'button' });
+
+        // Ensure NFT is showing
+        await driver.waitForSelector(
+          '.confirm-page-container-summary__title img',
+        );
+        await driver.waitForSelector({ css: 'h3', text: 'Test Dapp NFTs #1' });
+
+        // Click edit
+        await driver.clickElement(
+          '[data-testid="confirm-page-back-edit-button"]',
+        );
+
+        // Open the Amount modal
+        await driver.clickElement('.asset-picker__symbol');
+
+        // Choose tokens
+        await driver.clickElement({ css: 'button', text: 'Tokens' });
+        await driver.clickElement(
+          '[data-testid="multichain-token-list-button"]',
+        );
+
+        // Ensure correct token selected
+        await driver.waitForSelector({
+          css: '.asset-picker__symbol',
+          text: 'ETH',
+        });
+
+        // Populate an amount, continue
+        await driver.clickElement('[data-testid="currency-input"]');
+        await driver.press('[data-testid="currency-input"]', '2');
+        await driver.clickElement({ text: 'Continue', css: 'button' });
+
+        // Validate the send amount
+        await driver.waitForSelector({
+          css: '.currency-display-component__text',
+          text: '2.000042',
+        });
+
+        // Send it!
+        await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+        // Ensure it was sent
+        await driver.waitForSelector({ css: 'p', text: 'Send' });
+        await driver.waitForSelector({
+          css: '[data-testid="transaction-list-item-primary-currency"]',
+          text: '-2 ETH',
+        });
+      },
+    );
+  });
+
+  it('changes to native currency when switching accounts during a NFT send', async function () {
+    const smartContract = SMART_CONTRACTS.NFTS;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+        ganacheOptions: defaultGanacheOptions,
+        smartContract,
+        title: this.test.fullTitle(),
+      },
+      async ({ driver, ganacheServer }) => {
+        await logInWithBalanceValidation(driver, ganacheServer);
+
+        // Create second account
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-action-button"]',
+        );
+        await driver.clickElement(
+          '[data-testid="multichain-account-menu-popover-add-account"]',
+        );
+        await driver.fill('[placeholder="Account 2"]', 'Account 2');
+        await driver.clickElement({ text: tEn('create'), tag: 'button' });
+
+        // Go back to Account 1
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        await driver.clickElement({
+          css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+          text: 'Account 1',
+        });
+
+        // Choose the nft
+        await driver.clickElement('[data-testid="home__nfts-tab"]');
+        await driver.clickElement('[data-testid="nft-default-image"]');
+        await driver.clickElement('[data-testid="nft-send-button"]');
+
+        // Chose a recipient
+        await driver.clickElement('.multichain-account-list-item');
+
+        // Validate that an NFT is chosen in the AssetAmountPicker
+        await driver.waitForSelector({
+          css: '.asset-picker__symbol',
+          text: 'TDN',
+        });
+        await driver.waitForSelector({ css: 'p', text: '#1' });
+
+        // Switch to Account 2
+        await driver.clickElement('[data-testid="send-page-account-picker"]');
+        await driver.clickElement({
+          css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+          text: 'Account 2',
+        });
+
+        // Ensure that the AssetPicker shows native currency and 0 value
+        await driver.waitForSelector({
+          css: '.asset-picker__symbol',
+          text: 'ETH',
+        });
+
+        // Populate an amount, continue
+        await driver.clickElement('[data-testid="currency-input"]');
+        await driver.press('[data-testid="currency-input"]', '2');
+        await driver.clickElement({ text: 'Continue', css: 'button' });
+
+        // Validate the send amount
+        await driver.waitForSelector({
+          css: '.currency-display-component__text',
+          text: '2.000042',
+        });
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/transaction/send-eth.spec.js b/test/e2e/tests/transaction/send-eth.spec.js
index 59c34055d9ae..b56f5847778b 100644
--- a/test/e2e/tests/transaction/send-eth.spec.js
+++ b/test/e2e/tests/transaction/send-eth.spec.js
@@ -6,7 +6,7 @@ const {
   logInWithBalanceValidation,
   openActionMenuAndStartSendFlow,
   unlockWallet,
-  editGasfeeForm,
+  editGasFeeForm,
   WINDOW_TITLES,
   defaultGanacheOptions,
 } = require('../../helpers');
@@ -287,7 +287,7 @@ describe('Send ETH', function () {
               text: 'Edit priority',
               tag: 'header',
             });
-            await editGasfeeForm(driver, '21000', '100');
+            await editGasFeeForm(driver, '21000', '100');
             await driver.waitForSelector({
               css: '.transaction-detail-item:nth-of-type(1) h6:nth-of-type(2)',
               text: '0.0021 ETH',
diff --git a/test/e2e/vault-decryption-chrome.spec.js b/test/e2e/vault-decryption-chrome.spec.js
index aa1019149b54..42a9a89e48ce 100644
--- a/test/e2e/vault-decryption-chrome.spec.js
+++ b/test/e2e/vault-decryption-chrome.spec.js
@@ -50,13 +50,9 @@ async function getExtensionStorageFilePath(driver) {
  */
 async function closePopoverIfPresent(driver) {
   const popoverButtonSelector = '[data-testid="popover-close"]';
-  try {
-    if (await driver.isElementPresent(popoverButtonSelector)) {
-      await driver.clickElement(popoverButtonSelector);
-    }
-  } catch (_err) {
-    // No popover
-  }
+  const linkNoThanks = { text: 'No thanks', tag: 'button' };
+  await driver.clickElementSafe(popoverButtonSelector);
+  await driver.clickElementSafe(linkNoThanks);
 }
 
 /**
diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
index 8efae8816576..5767859ea2b2 100644
--- a/test/e2e/webdriver/driver.js
+++ b/test/e2e/webdriver/driver.js
@@ -476,6 +476,10 @@ class Driver {
     await this.fill(rawLocator, Key.chord(this.Key.MODIFIER, 'v'));
   }
 
+  async pasteFromClipboardIntoField(rawLocator) {
+    await this.fill(rawLocator, Key.chord(this.Key.MODIFIER, 'v'));
+  }
+
   // Navigation
 
   async navigate(page = PAGES.HOME) {
diff --git a/test/env.js b/test/env.js
index 240a7f55b25e..e80daf9441ea 100644
--- a/test/env.js
+++ b/test/env.js
@@ -3,3 +3,11 @@ process.env.SUPPORT_LINK = 'https://support.metamask.io';
 process.env.SUPPORT_REQUEST_LINK = 'https://metamask.zendesk.com/hc/en-us';
 process.env.IFRAME_EXECUTION_ENVIRONMENT_URL =
   'https://execution.metamask.io/0.36.1-flask.1/index.html';
+process.env.AUTH_API = 'https://mock-test-auth-api.metamask.io';
+process.env.OIDC_API = 'https://mock-test-oidc-api.metamask.io';
+process.env.USER_STORAGE_API = 'https://mock-test-user-storage.metamask.io';
+process.env.CONTENTFUL_ACCESS_SPACE_ID = 'MOCK_SPACE_ID';
+process.env.CONTENTFUL_ACCESS_TOKEN = 'MOCK_ACCESS_TOKEN';
+process.env.TRIGGERS_SERVICE_URL = 'https://mock-test-triggers-api.metamask.io';
+process.env.NOTIFICATIONS_SERVICE_URL =
+  'https://mock-test-notifications-api.metamask.io';
diff --git a/test/helpers/setup-helper.js b/test/helpers/setup-helper.js
index a5597f4d431c..98994a8fe037 100644
--- a/test/helpers/setup-helper.js
+++ b/test/helpers/setup-helper.js
@@ -111,7 +111,7 @@ if (!window.crypto) {
 }
 if (!window.crypto.getRandomValues) {
   // eslint-disable-next-line node/global-require
-  window.crypto.getRandomValues = require('polyfill-crypto.getrandomvalues');
+  window.crypto.getRandomValues = require('crypto').webcrypto.getRandomValues;
 }
 
 // TextEncoder/TextDecoder
diff --git a/test/jest/constants.js b/test/jest/constants.js
index 89a6b33357fc..6f15a9d24d7e 100644
--- a/test/jest/constants.js
+++ b/test/jest/constants.js
@@ -1,2 +1,2 @@
 export const METASWAP_BASE_URL = 'https://swap.metaswap.codefi.network';
-export const GAS_API_URL = 'https://gas.api.cx.metamask.io';
+export const GAS_API_URL = 'https://gas.api.infura.io';
diff --git a/test/jest/index.js b/test/jest/index.js
index 06ee400b24fe..e82392f8c0b4 100644
--- a/test/jest/index.js
+++ b/test/jest/index.js
@@ -1,5 +1,8 @@
 export { screen, fireEvent, waitFor } from '@testing-library/react';
-export { createSwapsMockStore } from './mock-store';
+export {
+  createSwapsMockStore,
+  createGetSmartTransactionFeesApiResponse,
+} from './mock-store';
 export { renderWithProvider } from './rendering';
 export * as MOCKS from './mocks';
 export * as CONSTANTS from './constants';
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index af851bba6105..0719c6f1eea8 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -1,10 +1,10 @@
 import { NetworkType } from '@metamask/controller-utils';
 import { NetworkStatus } from '@metamask/network-controller';
 import { EthAccountType, EthMethod } from '@metamask/keyring-api';
-import { CHAIN_IDS } from '../../shared/constants/network';
+import { CHAIN_IDS, CURRENCY_SYMBOLS } from '../../shared/constants/network';
 import { KeyringType } from '../../shared/constants/keyring';
 
-const createGetSmartTransactionFeesApiResponse = () => {
+export const createGetSmartTransactionFeesApiResponse = () => {
   return {
     tradeTxFees: {
       // Approval tx.
@@ -150,6 +150,7 @@ export const createSwapsMockStore = () => {
       },
       preferences: {
         showFiatInTestnets: true,
+        smartTransactionsOptInStatus: true,
       },
       transactions: [
         {
@@ -361,7 +362,13 @@ export const createSwapsMockStore = () => {
           accounts: ['0xd85a4b6a394794842887b8284293d69163007bbb'],
         },
       ],
-      networkConfigurations: {},
+      networkConfigurations: {
+        'network-configuration-id-1': {
+          chainId: CHAIN_IDS.MAINNET,
+          ticker: CURRENCY_SYMBOLS.ETH,
+          rpcUrl: 'https://mainnet.infura.io/v3/',
+        },
+      },
       tokens: [
         {
           erc20: true,
@@ -378,6 +385,15 @@ export const createSwapsMockStore = () => {
       ],
       swapsState: {
         swapsFeatureFlags: {
+          ethereum: {
+            extensionActive: true,
+            mobileActive: false,
+            smartTransactions: {
+              expectedDeadline: 45,
+              maxDeadline: 150,
+              returnTxHashAsap: false,
+            },
+          },
           smartTransactions: {
             mobileActive: true,
             extensionActive: true,
diff --git a/test/jest/mocks.js b/test/jest/mocks.js
index 96226563adb3..e16c656d8b49 100644
--- a/test/jest/mocks.js
+++ b/test/jest/mocks.js
@@ -162,7 +162,7 @@ export function createMockInternalAccount({
   is4337 = false,
   keyringType = KeyringTypes.hd,
   snapOptions,
-}) {
+} = {}) {
   return {
     address,
     id: uuidv4(),
@@ -191,3 +191,9 @@ export function createMockInternalAccount({
     type: is4337 ? EthAccountType.Erc4337 : EthAccountType.Eoa,
   };
 }
+
+export const getSelectedInternalAccountFromMockState = (state) => {
+  return state.metamask.internalAccounts.accounts[
+    state.metamask.internalAccounts.selectedAccount
+  ];
+};
diff --git a/test/jest/setup.js b/test/jest/setup.js
index 5f713c1e0ad7..e4fb03adad3a 100644
--- a/test/jest/setup.js
+++ b/test/jest/setup.js
@@ -15,6 +15,11 @@ jest.mock('../../ui/hooks/usePetnamesEnabled', () => ({
   usePetnamesEnabled: () => false,
 }));
 
+jest.mock('../../app/scripts/snaps/preinstalled-snaps', () => ({
+  __esModule: true,
+  default: [],
+}));
+
 const UNRESOLVED = Symbol('timedOut');
 
 // Store this in case it gets stubbed later
diff --git a/test/scenarios/10. address-book/add a contact to the address book.csv b/test/manual-scenarios/address-book/add a contact to the address book.csv
similarity index 100%
rename from test/scenarios/10. address-book/add a contact to the address book.csv
rename to test/manual-scenarios/address-book/add a contact to the address book.csv
diff --git a/test/scenarios/10. address-book/remove a contact from the address book.csv b/test/manual-scenarios/address-book/remove a contact from the address book.csv
similarity index 100%
rename from test/scenarios/10. address-book/remove a contact from the address book.csv
rename to test/manual-scenarios/address-book/remove a contact from the address book.csv
diff --git a/test/scenarios/10. address-book/update a contact in the address book.csv b/test/manual-scenarios/address-book/update a contact in the address book.csv
similarity index 100%
rename from test/scenarios/10. address-book/update a contact in the address book.csv
rename to test/manual-scenarios/address-book/update a contact in the address book.csv
diff --git a/test/scenarios/8. backup/backup user data.csv b/test/manual-scenarios/backup/backup user data.csv
similarity index 100%
rename from test/scenarios/8. backup/backup user data.csv
rename to test/manual-scenarios/backup/backup user data.csv
diff --git a/test/scenarios/8. backup/restore user data.csv b/test/manual-scenarios/backup/restore user data.csv
similarity index 100%
rename from test/scenarios/8. backup/restore user data.csv
rename to test/manual-scenarios/backup/restore user data.csv
diff --git a/test/scenarios/18. contract/deploy contract, mint and import NFT with hardware wallet.csv b/test/manual-scenarios/contract/deploy contract, mint and import NFT with hardware wallet.csv
similarity index 100%
rename from test/scenarios/18. contract/deploy contract, mint and import NFT with hardware wallet.csv
rename to test/manual-scenarios/contract/deploy contract, mint and import NFT with hardware wallet.csv
diff --git a/test/scenarios/18. contract/hardware wallet qr based connect.csv b/test/manual-scenarios/contract/hardware wallet qr based connect.csv
similarity index 100%
rename from test/scenarios/18. contract/hardware wallet qr based connect.csv
rename to test/manual-scenarios/contract/hardware wallet qr based connect.csv
diff --git a/test/scenarios/18. contract/send token with hardware wallet.csv b/test/manual-scenarios/contract/send token with hardware wallet.csv
similarity index 100%
rename from test/scenarios/18. contract/send token with hardware wallet.csv
rename to test/manual-scenarios/contract/send token with hardware wallet.csv
diff --git a/test/scenarios/12. encrypt and decrypt/encrypt and decrypt.csv b/test/manual-scenarios/encrypt and decrypt/encrypt and decrypt.csv
similarity index 100%
rename from test/scenarios/12. encrypt and decrypt/encrypt and decrypt.csv
rename to test/manual-scenarios/encrypt and decrypt/encrypt and decrypt.csv
diff --git a/test/scenarios/5. ens/name resolution.csv b/test/manual-scenarios/ens/name resolution.csv
similarity index 100%
rename from test/scenarios/5. ens/name resolution.csv
rename to test/manual-scenarios/ens/name resolution.csv
diff --git a/test/scenarios/11. gas fee/EIP-1559 gas.csv b/test/manual-scenarios/gas fee/EIP-1559 gas.csv
similarity index 100%
rename from test/scenarios/11. gas fee/EIP-1559 gas.csv
rename to test/manual-scenarios/gas fee/EIP-1559 gas.csv
diff --git a/test/scenarios/11. gas fee/legacy gas.csv b/test/manual-scenarios/gas fee/legacy gas.csv
similarity index 100%
rename from test/scenarios/11. gas fee/legacy gas.csv
rename to test/manual-scenarios/gas fee/legacy gas.csv
diff --git a/test/scenarios/16. incoming-transactions/receive native token.csv b/test/manual-scenarios/incoming-transactions/receive native token.csv
similarity index 100%
rename from test/scenarios/16. incoming-transactions/receive native token.csv
rename to test/manual-scenarios/incoming-transactions/receive native token.csv
diff --git a/test/scenarios/2. keyring/connect hardware wallet.csv b/test/manual-scenarios/keyring/connect hardware wallet.csv
similarity index 100%
rename from test/scenarios/2. keyring/connect hardware wallet.csv
rename to test/manual-scenarios/keyring/connect hardware wallet.csv
diff --git a/test/scenarios/2. keyring/reset a wallet.csv b/test/manual-scenarios/keyring/reset a wallet.csv
similarity index 100%
rename from test/scenarios/2. keyring/reset a wallet.csv
rename to test/manual-scenarios/keyring/reset a wallet.csv
diff --git a/test/scenarios/9. metrics/send event metrics.csv b/test/manual-scenarios/metrics/send event metrics.csv
similarity index 100%
rename from test/scenarios/9. metrics/send event metrics.csv
rename to test/manual-scenarios/metrics/send event metrics.csv
diff --git a/test/scenarios/7. network/add custom network from dApp.csv b/test/manual-scenarios/network/add custom network from dApp.csv
similarity index 100%
rename from test/scenarios/7. network/add custom network from dApp.csv
rename to test/manual-scenarios/network/add custom network from dApp.csv
diff --git a/test/scenarios/7. network/add custom network manually.csv b/test/manual-scenarios/network/add custom network manually.csv
similarity index 100%
rename from test/scenarios/7. network/add custom network manually.csv
rename to test/manual-scenarios/network/add custom network manually.csv
diff --git a/test/scenarios/7. network/add network from the list of popular networks.csv b/test/manual-scenarios/network/add network from the list of popular networks.csv
similarity index 100%
rename from test/scenarios/7. network/add network from the list of popular networks.csv
rename to test/manual-scenarios/network/add network from the list of popular networks.csv
diff --git a/test/scenarios/7. network/delete networks from the dropdown list.csv b/test/manual-scenarios/network/delete networks from the dropdown list.csv
similarity index 100%
rename from test/scenarios/7. network/delete networks from the dropdown list.csv
rename to test/manual-scenarios/network/delete networks from the dropdown list.csv
diff --git a/test/scenarios/7. network/delete networks in Settings.csv b/test/manual-scenarios/network/delete networks in Settings.csv
similarity index 100%
rename from test/scenarios/7. network/delete networks in Settings.csv
rename to test/manual-scenarios/network/delete networks in Settings.csv
diff --git a/test/scenarios/7. network/switching networks.csv b/test/manual-scenarios/network/switching networks.csv
similarity index 100%
rename from test/scenarios/7. network/switching networks.csv
rename to test/manual-scenarios/network/switching networks.csv
diff --git a/test/scenarios/7. network/update networks.csv b/test/manual-scenarios/network/update networks.csv
similarity index 100%
rename from test/scenarios/7. network/update networks.csv
rename to test/manual-scenarios/network/update networks.csv
diff --git a/test/scenarios/1. onboarding/create a wallet.csv b/test/manual-scenarios/onboarding/create a wallet.csv
similarity index 100%
rename from test/scenarios/1. onboarding/create a wallet.csv
rename to test/manual-scenarios/onboarding/create a wallet.csv
diff --git a/test/scenarios/1. onboarding/import a wallet.csv b/test/manual-scenarios/onboarding/import a wallet.csv
similarity index 100%
rename from test/scenarios/1. onboarding/import a wallet.csv
rename to test/manual-scenarios/onboarding/import a wallet.csv
diff --git a/test/scenarios/14. permissions/connecting and disconnecting from a dapp.csv b/test/manual-scenarios/permissions/connecting and disconnecting from a dapp.csv
similarity index 100%
rename from test/scenarios/14. permissions/connecting and disconnecting from a dapp.csv
rename to test/manual-scenarios/permissions/connecting and disconnecting from a dapp.csv
diff --git a/test/scenarios/6. phishing/warning page.csv b/test/manual-scenarios/phishing/warning page.csv
similarity index 100%
rename from test/scenarios/6. phishing/warning page.csv
rename to test/manual-scenarios/phishing/warning page.csv
diff --git a/test/scenarios/17. settings/about-metamask/ui-validation.csv b/test/manual-scenarios/settings/about-metamask/ui-validation.csv
similarity index 100%
rename from test/scenarios/17. settings/about-metamask/ui-validation.csv
rename to test/manual-scenarios/settings/about-metamask/ui-validation.csv
diff --git a/test/scenarios/17. settings/advanced/check custom nonce toggle.csv b/test/manual-scenarios/settings/advanced/check custom nonce toggle.csv
similarity index 100%
rename from test/scenarios/17. settings/advanced/check custom nonce toggle.csv
rename to test/manual-scenarios/settings/advanced/check custom nonce toggle.csv
diff --git a/test/scenarios/17. settings/advanced/show-hex-data.csv b/test/manual-scenarios/settings/advanced/show-hex-data.csv
similarity index 100%
rename from test/scenarios/17. settings/advanced/show-hex-data.csv
rename to test/manual-scenarios/settings/advanced/show-hex-data.csv
diff --git a/test/scenarios/17. settings/general/change-language.csv b/test/manual-scenarios/settings/general/change-language.csv
similarity index 100%
rename from test/scenarios/17. settings/general/change-language.csv
rename to test/manual-scenarios/settings/general/change-language.csv
diff --git a/test/scenarios/13. sign/eth sign with hardware wallet.csv b/test/manual-scenarios/sign/eth sign with hardware wallet.csv
similarity index 100%
rename from test/scenarios/13. sign/eth sign with hardware wallet.csv
rename to test/manual-scenarios/sign/eth sign with hardware wallet.csv
diff --git a/test/scenarios/13. sign/eth sign.csv b/test/manual-scenarios/sign/eth sign.csv
similarity index 100%
rename from test/scenarios/13. sign/eth sign.csv
rename to test/manual-scenarios/sign/eth sign.csv
diff --git a/test/scenarios/13. sign/personal sign with hardware wallet.csv b/test/manual-scenarios/sign/personal sign with hardware wallet.csv
similarity index 100%
rename from test/scenarios/13. sign/personal sign with hardware wallet.csv
rename to test/manual-scenarios/sign/personal sign with hardware wallet.csv
diff --git a/test/scenarios/13. sign/personal sign.csv b/test/manual-scenarios/sign/personal sign.csv
similarity index 100%
rename from test/scenarios/13. sign/personal sign.csv
rename to test/manual-scenarios/sign/personal sign.csv
diff --git a/test/scenarios/13. sign/sign in with ethereum.csv b/test/manual-scenarios/sign/sign in with ethereum.csv
similarity index 100%
rename from test/scenarios/13. sign/sign in with ethereum.csv
rename to test/manual-scenarios/sign/sign in with ethereum.csv
diff --git a/test/scenarios/13. sign/sign typed data v3 with hardware wallet.csv b/test/manual-scenarios/sign/sign typed data v3 with hardware wallet.csv
similarity index 100%
rename from test/scenarios/13. sign/sign typed data v3 with hardware wallet.csv
rename to test/manual-scenarios/sign/sign typed data v3 with hardware wallet.csv
diff --git a/test/scenarios/13. sign/sign typed data v4 with hardware wallet.csv b/test/manual-scenarios/sign/sign typed data v4 with hardware wallet.csv
similarity index 100%
rename from test/scenarios/13. sign/sign typed data v4 with hardware wallet.csv
rename to test/manual-scenarios/sign/sign typed data v4 with hardware wallet.csv
diff --git a/test/scenarios/13. sign/sign typed with data.csv b/test/manual-scenarios/sign/sign typed with data.csv
similarity index 100%
rename from test/scenarios/13. sign/sign typed with data.csv
rename to test/manual-scenarios/sign/sign typed with data.csv
diff --git a/test/scenarios/15. swap/smart swap.csv b/test/manual-scenarios/swap/smart swap.csv
similarity index 100%
rename from test/scenarios/15. swap/smart swap.csv
rename to test/manual-scenarios/swap/smart swap.csv
diff --git a/test/scenarios/15. swap/swap eth.csv b/test/manual-scenarios/swap/swap eth.csv
similarity index 100%
rename from test/scenarios/15. swap/swap eth.csv
rename to test/manual-scenarios/swap/swap eth.csv
diff --git a/test/scenarios/4. tokens/approve erc 1155 token.csv b/test/manual-scenarios/tokens/approve erc 1155 token.csv
similarity index 100%
rename from test/scenarios/4. tokens/approve erc 1155 token.csv
rename to test/manual-scenarios/tokens/approve erc 1155 token.csv
diff --git a/test/scenarios/4. tokens/approve erc20 custom amount.csv b/test/manual-scenarios/tokens/approve erc20 custom amount.csv
similarity index 100%
rename from test/scenarios/4. tokens/approve erc20 custom amount.csv
rename to test/manual-scenarios/tokens/approve erc20 custom amount.csv
diff --git a/test/scenarios/4. tokens/approve erc20 token.csv b/test/manual-scenarios/tokens/approve erc20 token.csv
similarity index 100%
rename from test/scenarios/4. tokens/approve erc20 token.csv
rename to test/manual-scenarios/tokens/approve erc20 token.csv
diff --git a/test/scenarios/4. tokens/approve erc721 token.csv b/test/manual-scenarios/tokens/approve erc721 token.csv
similarity index 100%
rename from test/scenarios/4. tokens/approve erc721 token.csv
rename to test/manual-scenarios/tokens/approve erc721 token.csv
diff --git a/test/scenarios/4. tokens/autodetect NFTs.csv b/test/manual-scenarios/tokens/autodetect NFTs.csv
similarity index 100%
rename from test/scenarios/4. tokens/autodetect NFTs.csv
rename to test/manual-scenarios/tokens/autodetect NFTs.csv
diff --git a/test/scenarios/4. tokens/autodetect tokens.csv b/test/manual-scenarios/tokens/autodetect tokens.csv
similarity index 100%
rename from test/scenarios/4. tokens/autodetect tokens.csv
rename to test/manual-scenarios/tokens/autodetect tokens.csv
diff --git a/test/scenarios/4. tokens/import erc1155 token origin MM.csv b/test/manual-scenarios/tokens/import erc1155 token origin MM.csv
similarity index 100%
rename from test/scenarios/4. tokens/import erc1155 token origin MM.csv
rename to test/manual-scenarios/tokens/import erc1155 token origin MM.csv
diff --git a/test/scenarios/4. tokens/import erc1155 token origin dapp.csv b/test/manual-scenarios/tokens/import erc1155 token origin dapp.csv
similarity index 100%
rename from test/scenarios/4. tokens/import erc1155 token origin dapp.csv
rename to test/manual-scenarios/tokens/import erc1155 token origin dapp.csv
diff --git a/test/scenarios/4. tokens/import erc20 token origin MM.csv b/test/manual-scenarios/tokens/import erc20 token origin MM.csv
similarity index 100%
rename from test/scenarios/4. tokens/import erc20 token origin MM.csv
rename to test/manual-scenarios/tokens/import erc20 token origin MM.csv
diff --git a/test/scenarios/4. tokens/import erc20 token origin dapp.csv b/test/manual-scenarios/tokens/import erc20 token origin dapp.csv
similarity index 100%
rename from test/scenarios/4. tokens/import erc20 token origin dapp.csv
rename to test/manual-scenarios/tokens/import erc20 token origin dapp.csv
diff --git a/test/scenarios/4. tokens/import erc721 token origin MM.csv b/test/manual-scenarios/tokens/import erc721 token origin MM.csv
similarity index 100%
rename from test/scenarios/4. tokens/import erc721 token origin MM.csv
rename to test/manual-scenarios/tokens/import erc721 token origin MM.csv
diff --git a/test/scenarios/4. tokens/import erc721 token origin dapp.csv b/test/manual-scenarios/tokens/import erc721 token origin dapp.csv
similarity index 100%
rename from test/scenarios/4. tokens/import erc721 token origin dapp.csv
rename to test/manual-scenarios/tokens/import erc721 token origin dapp.csv
diff --git a/test/manual-scenarios/transactions/cancel transaction using same nonce.csv b/test/manual-scenarios/transactions/cancel transaction using same nonce.csv
new file mode 100644
index 000000000000..3a1df36d29e7
--- /dev/null
+++ b/test/manual-scenarios/transactions/cancel transaction using same nonce.csv	
@@ -0,0 +1,19 @@
+Step,Test steps,Test data,Expected result,Notes
+1,Open the extension.,,The 'Welcome Back' screen is shown.,
+2,Proceed to Unlock the wallet.,password (8 characters min).,The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.        ,
+3,Switch networks to a test network.,e.g. Sepolia,The Sepolia balance is shown on the overview. The wallet address is shown on the overview. The selected network is Sepolia.,
+4,Click on three-dot menu located in the upper right corner.,,,
+5,Go to 'Settings'.,,,
+6,Choose 'Advanced'.,,"The ""Customize transaction nonce"" feature is set to be off by default.",
+7,Turn on 'Customize transaction'.,,,
+8,Navigate back to the main wallet screen to continue.,,,Click on the MetaMask logo or return to the MetaMask tab if the extension is in the expanded view mode.
+9,"Create the transaction by clicking ""Send"" button.",,"MetaMask popup with the recipient's address, amount to be sent, gas fee estimates is displayed.",You can use this address as a recipient's address : 0x0c54FcCd2e384b4BB6f2E405Bf5Cbc15a017AaFb
+10,Click 'Next'.,,"Metamask popup with the recipient's address, amount, gas and total fees is displayed. The ""Custom nonce"" field with the next suggested nonce value is shown on the confirmation screen.",
+11,Set very low gas fee using 'Advanced' gas setting,,Click the pen icon in the 'Estimated fee' field to access 'Advanced' gas settings. Set very low 'Max base fee' and 'Priority fee' (i.e. 0.0001 GWEI).,Opting for a lower gas fee provides the flexibility to send a subsequent transaction to cancel the current one.
+12,Proceed to confirm transaction.,,,
+13,Switch to the Activity tab.,,"In the activity tab, the transaction is currently displayed as being in a pending state.",Make a note of the transaction nonce value.
+14,"Create another transaction by clicking ""Send"" button.",,"MetaMask popup with the recipient's address, amount to be sent, gas fee estimates is displayed.",Select your testing account address as the recipient's address and set the transaction amount to 0.
+15,Click 'Next'.,,"Metamask popup with the recipient's address, amount, gas and total fees is displayed. The ""Custom nonce"" field with the next suggested nonce value is shown on the confirmation screen.",Use the same nonce value that was assigned to the previous transaction.
+16,Proceed to confirm the transaction.,,,
+17,Switch to the Activity tab.,,One 'Send' transaction with the same nonce and 0 value in 'Pending' state is displayed.,
+18,Allow some time for the transaction to get confirmed.,, 'Send' and 'Receive' transactions with 0 value and the same nonce are shown on the Activity tab.,The previous transaction was cancelled by the newly created transaction with the same nonce and 0 value.
\ No newline at end of file
diff --git a/test/scenarios/3. transactions/cancel transaction.csv b/test/manual-scenarios/transactions/cancel transaction.csv
similarity index 100%
rename from test/scenarios/3. transactions/cancel transaction.csv
rename to test/manual-scenarios/transactions/cancel transaction.csv
diff --git a/test/scenarios/3. transactions/deploy failing transaction.csv b/test/manual-scenarios/transactions/deploy failing transaction.csv
similarity index 100%
rename from test/scenarios/3. transactions/deploy failing transaction.csv
rename to test/manual-scenarios/transactions/deploy failing transaction.csv
diff --git a/test/scenarios/3. transactions/deposit and withdraw.csv b/test/manual-scenarios/transactions/deposit and withdraw.csv
similarity index 100%
rename from test/scenarios/3. transactions/deposit and withdraw.csv
rename to test/manual-scenarios/transactions/deposit and withdraw.csv
diff --git a/test/scenarios/3. transactions/navigate multiple transactions.csv b/test/manual-scenarios/transactions/navigate multiple transactions.csv
similarity index 100%
rename from test/scenarios/3. transactions/navigate multiple transactions.csv
rename to test/manual-scenarios/transactions/navigate multiple transactions.csv
diff --git a/test/scenarios/3. transactions/send erc20 token origin MM.csv b/test/manual-scenarios/transactions/send erc20 token origin MM.csv
similarity index 100%
rename from test/scenarios/3. transactions/send erc20 token origin MM.csv
rename to test/manual-scenarios/transactions/send erc20 token origin MM.csv
diff --git a/test/scenarios/3. transactions/send erc20 token origin dapp.csv b/test/manual-scenarios/transactions/send erc20 token origin dapp.csv
similarity index 100%
rename from test/scenarios/3. transactions/send erc20 token origin dapp.csv
rename to test/manual-scenarios/transactions/send erc20 token origin dapp.csv
diff --git a/test/scenarios/3. transactions/send erc721 token origin MM.csv b/test/manual-scenarios/transactions/send erc721 token origin MM.csv
similarity index 100%
rename from test/scenarios/3. transactions/send erc721 token origin MM.csv
rename to test/manual-scenarios/transactions/send erc721 token origin MM.csv
diff --git a/test/scenarios/3. transactions/send erc721 token origin dapp.csv b/test/manual-scenarios/transactions/send erc721 token origin dapp.csv
similarity index 100%
rename from test/scenarios/3. transactions/send erc721 token origin dapp.csv
rename to test/manual-scenarios/transactions/send erc721 token origin dapp.csv
diff --git a/test/scenarios/3. transactions/send native token origin MM.csv b/test/manual-scenarios/transactions/send native token origin MM.csv
similarity index 100%
rename from test/scenarios/3. transactions/send native token origin MM.csv
rename to test/manual-scenarios/transactions/send native token origin MM.csv
diff --git a/test/scenarios/3. transactions/send native token origin dapp.csv b/test/manual-scenarios/transactions/send native token origin dapp.csv
similarity index 100%
rename from test/scenarios/3. transactions/send native token origin dapp.csv
rename to test/manual-scenarios/transactions/send native token origin dapp.csv
diff --git a/test/manual-scenarios/transactions/send transactions with custom nonce.csv b/test/manual-scenarios/transactions/send transactions with custom nonce.csv
new file mode 100644
index 000000000000..7cffbe1742f4
--- /dev/null
+++ b/test/manual-scenarios/transactions/send transactions with custom nonce.csv	
@@ -0,0 +1,23 @@
+Step,Test steps,Test data,Expected result,Notes
+1,Open the extension.,,The Welcome Back screen is shown.,
+2,Proceed to Unlock the wallet.,password (8 characters min).,The Ether balance is shown on the overview. The wallet address is shown on the overview. The selected network is Ethereum Mainnet.        ,
+3,Switch networks to a test network.,e.g. Sepolia,The Sepolia balance is shown on the overview. The wallet address is shown on the overview. The selected network is Sepolia.,
+4,Click on three-dot menu located in the upper right corner.,,,
+5,"Go to ""Settings"".",,,
+6,"Choose ""Advanced"".",,"The ""Customize transaction nonce"" feature is set to be off by default.",
+7,Turn on 'Customize transaction'.,,,
+8,Navigate back to the main wallet screen to continue.,,,Click on the MetaMask logo or return to the MetaMask tab if the extension is in the expanded view mode.
+9,"Create the transaction by clicking ""Send"" button.",,"MetaMask popup with the recipient's address, amount to be sent, gas fee estimates is displayed.",You can use this address as a recipient's address : 0x0c54FcCd2e384b4BB6f2E405Bf5Cbc15a017AaFb
+10,"Click ""Next"".",,"Metamask popup with the recipient's address, amount, gas and total fees is displayed. The ""Custom nonce"" field with the next suggested nonce value is shown on the confirmation screen.",
+11,Increment the suggested nonce value by one.,,"In the ""Custom nonce"" field, enter the suggested value plus one.",The up and down increment arrows may not be functioning as intended at the moment. It would be best to refrain from using them.
+12,Proceed to confirm transaction.,,,
+13,Switch to the Activity tab.,,"In the activity tab, the transaction is currently displayed as being in a pending state.",The transaction will remain in a pending state until the transaction with the preceding nonce value has been successfully confirmed.
+14,"Create another transaction by clicking ""Send"" button.",,"MetaMask popup with the recipient's address, amount to be sent, gas fee estimates is displayed.",You can use this address as a recipient's address : 0x0c54FcCd2e384b4BB6f2E405Bf5Cbc15a017AaFb
+15,"Click ""Next"".",,"Metamask popup with the recipient's address, amount, gas and total fees is displayed. The ""Custom nonce"" field with the next suggested nonce value is shown on the confirmation screen.",
+16,Proceed to confirm the transaction using the recommended nonce value.,,,
+17,Switch to the Activity tab.,,Two transactions are currently pending and visible in the Activity tab. Please allow some time for these transactions to be successfully confirmed.,
+18,"Create another transaction by clicking ""Send"" button.",,"MetaMask popup with the recipient's address, amount to be sent, gas fee estimates is displayed.",You can use this address as a recipient's address : 0x0c54FcCd2e384b4BB6f2E405Bf5Cbc15a017AaFb
+19,"Click ""Next"".",,"Metamask popup with the recipient's address, amount, gas and total fees is displayed. The ""Custom nonce"" field with the next suggested nonce value is shown on the confirmation screen.",
+20,Reduce the suggested nonce value by one.,,"In the ""Custom nonce"" field, enter the suggested value minus one.",
+21,Proceed to confirm the transaction with low nonce value.,,,
+22,Low nonce transaction   fails.,,"Popup notification  about failed transaction appears: ""Transaction *** failed! Nonce too low: next nonce ***, tx nonce ***."" Current transaction appears as ""Failed"" on the activity list.",Note that low nonce failed transaction is visible on the activity only in case when  previous successful  transaction with the same nonce is not shown on the Activity list.
\ No newline at end of file
diff --git a/test/scenarios/3. transactions/speed up transaction.csv b/test/manual-scenarios/transactions/speed up transaction.csv
similarity index 100%
rename from test/scenarios/3. transactions/speed up transaction.csv
rename to test/manual-scenarios/transactions/speed up transaction.csv
diff --git a/test/setup.js b/test/setup.js
index 3cb6b155e8ee..f96e744a917a 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -5,3 +5,5 @@ require('./helpers/setup-helper');
 
 window.SVGPathElement = window.SVGPathElement || { prototype: {} };
 global.indexedDB = {};
+// scrollIntoView is not available in JSDOM
+window.HTMLElement.prototype.scrollIntoView = () => undefined
diff --git a/types/global.d.ts b/types/global.d.ts
index 7a76ed7e1dd4..47bbb77c9512 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -22,6 +22,8 @@ declare class Platform {
   openTab: (opts: { url: string }) => void;
 
   closeCurrentWindow: () => void;
+
+  openExtensionInBrowser?: (_1, _1, condition: boolean) => void;
 }
 
 declare class MessageSender {
@@ -68,6 +70,8 @@ type sendMessage = {
     callback?: (response: Record<string, unknown>) => void,
   ): void;
   (
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     message: any,
     options?: Record<string, unknown>,
     callback?: (response: Record<string, unknown>) => void,
@@ -190,6 +194,8 @@ type sendMessage = {
         url: string;
       };
     },
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callback: (response: { result: any; error?: Error }) => void,
   );
   (
@@ -202,6 +208,8 @@ declare class Runtime {
   onMessage: {
     addListener: (
       callback: (
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         message: any,
         sender: MessageSender,
         sendResponse: (response?: ResponseType) => void,
diff --git a/types/react-tippy.d.ts b/types/react-tippy.d.ts
index d03844e5c848..80ac4fa04073 100644
--- a/types/react-tippy.d.ts
+++ b/types/react-tippy.d.ts
@@ -47,7 +47,11 @@ declare module 'react-tippy' {
     followCursor?: boolean;
     inertia?: boolean;
     transitionFlip?: boolean;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     popperOptions?: any;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     html?: React.ReactElement<any>;
     unmountHTMLWhenHide?: boolean;
     size?: Size;
diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js
index 3a96a6b9688f..2d4cd29dc648 100644
--- a/ui/components/app/add-network/add-network.js
+++ b/ui/components/app/add-network/add-network.js
@@ -160,6 +160,7 @@ const AddNetwork = () => {
                 variant={TextVariant.headingSm}
                 as="h4"
                 color={TextColor.textDefault}
+                data-testid="add-network-button"
               >
                 {t('addANetwork')}
               </Text>
diff --git a/ui/components/app/add-network/add-network.test.js b/ui/components/app/add-network/add-network.test.js
index 1bfd6dc26fc5..3a15f4d33c3e 100644
--- a/ui/components/app/add-network/add-network.test.js
+++ b/ui/components/app/add-network/add-network.test.js
@@ -27,6 +27,13 @@ jest.mock('../../../selectors', () => ({
   getTheme: () => 'light',
 }));
 
+jest.mock(
+  '../../../pages/confirmations/components/simulation-details/useBalanceChanges',
+  () => ({
+    useBalanceChanges: jest.fn(),
+  }),
+);
+
 const render = () => {
   const store = configureStore({
     metamask: {
diff --git a/ui/components/app/alerts/alerts.js b/ui/components/app/alerts/alerts.js
index 388fd8ac0d7a..d7a277bd2679 100644
--- a/ui/components/app/alerts/alerts.js
+++ b/ui/components/app/alerts/alerts.js
@@ -2,25 +2,17 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 
-import { alertIsOpen as unconnectedAccountAlertIsOpen } from '../../../ducks/alerts/unconnected-account';
 import { alertIsOpen as invalidCustomNetworkAlertIsOpen } from '../../../ducks/alerts/invalid-custom-network';
 import InvalidCustomNetworkAlert from './invalid-custom-network-alert';
-import UnconnectedAccountAlert from './unconnected-account-alert';
 
 const Alerts = ({ history }) => {
   const _invalidCustomNetworkAlertIsOpen = useSelector(
     invalidCustomNetworkAlertIsOpen,
   );
-  const _unconnectedAccountAlertIsOpen = useSelector(
-    unconnectedAccountAlertIsOpen,
-  );
 
   if (_invalidCustomNetworkAlertIsOpen) {
     return <InvalidCustomNetworkAlert history={history} />;
   }
-  if (_unconnectedAccountAlertIsOpen && !process.env.MULTICHAIN) {
-    return <UnconnectedAccountAlert />;
-  }
 
   return null;
 };
diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss
index 4fd5b9ae16c4..5b72eb8f95b1 100644
--- a/ui/components/app/app-components.scss
+++ b/ui/components/app/app-components.scss
@@ -5,6 +5,8 @@
 @import 'alerts/alerts';
 @import 'beta-header/index';
 @import 'cancel-speedup-popover/index';
+@import 'confirmations/alerts/alert-modal/index';
+@import 'confirmations/alerts/inline-alert/index';
 @import 'import-token/index';
 @import 'nfts-items/index';
 @import 'nfts-tab/index';
@@ -36,13 +38,13 @@
 @import 'network-display/index';
 @import 'incoming-trasaction-toggle/network-toggle';
 @import 'permission-page-container/index';
-@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 'step-progress-bar/index.scss';
 @import 'selected-account/index';
+@import 'smart-transactions/index';
 @import 'srp-input/srp-input';
 @import 'snaps/snap-privacy-warning/index';
 @import 'tab-bar/index';
diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index 7827576c9588..a4e30cad81fc 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import TokenList from '../token-list';
@@ -11,11 +11,10 @@ import {
   getDetectedTokensInCurrentNetwork,
   getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
   getShouldHideZeroBalanceTokens,
-  getIsBuyableChain,
-  getCurrentNetwork,
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  getSwapsDefaultToken,
+  getIsBuyableChain,
   ///: END:ONLY_INCLUDE_IF
+  getCurrentNetwork,
   getSelectedAccount,
   getPreferences,
   getIsMainnet,
@@ -25,7 +24,6 @@ import {
   getProviderConfig,
 } from '../../../ducks/metamask/metamask';
 import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
-import Box from '../../ui/box/box';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
@@ -36,43 +34,36 @@ import {
   DetectedTokensBanner,
   TokenListItem,
   ImportTokenLink,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  AssetListConversionButton,
-  ///: END:ONLY_INCLUDE_IF
+  ReceiveTokenLink,
 } from '../../multichain';
-///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-import useRamps from '../../../hooks/experiences/useRamps';
-///: END:ONLY_INCLUDE_IF
-import { Display } from '../../../helpers/constants/design-system';
-
-import { ReceiveModal } from '../../multichain/receive-modal';
 import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance';
-///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-import { ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES } from '../../multichain/asset-list-conversion-button/asset-list-conversion-button';
-///: END:ONLY_INCLUDE_IF
 import { useIsOriginalNativeTokenSymbol } from '../../../hooks/useIsOriginalNativeTokenSymbol';
 import {
   showPrimaryCurrency,
   showSecondaryCurrency,
 } from '../../../../shared/modules/currency-display.utils';
 import { roundToDecimalPlacesRemovingExtraZeroes } from '../../../helpers/utils/util';
-import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
-import { getCurrentLocale } from '../../../ducks/locale/locale';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+import {
+  RAMPS_CARD_VARIANT_TYPES,
+  RampsCard,
+} from '../../multichain/ramps-card/ramps-card';
+///: END:ONLY_INCLUDE_IF
 
 const AssetList = ({ onClickAsset }) => {
   const [showDetectedTokens, setShowDetectedTokens] = useState(false);
   const selectedAccountBalance = useSelector(getSelectedAccountCachedBalance);
   const nativeCurrency = useSelector(getNativeCurrency);
   const showFiat = useSelector(getShouldShowFiat);
-  const { chainId, nickname } = useSelector(getCurrentNetwork);
-  const currentLocale = useSelector(getCurrentLocale);
+  const { chainId } = useSelector(getCurrentNetwork);
   const isMainnet = useSelector(getIsMainnet);
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
-  const { ticker, type } = useSelector(getProviderConfig);
+  const { ticker, type, rpcUrl } = useSelector(getProviderConfig);
   const isOriginalNativeSymbol = useIsOriginalNativeTokenSymbol(
     chainId,
     ticker,
     type,
+    rpcUrl,
   );
   const trackEvent = useContext(MetaMetricsContext);
   const balance = useSelector(getSelectedAccountCachedBalance);
@@ -82,8 +73,6 @@ const AssetList = ({ onClickAsset }) => {
     getShouldHideZeroBalanceTokens,
   );
 
-  const [showReceiveModal, setShowReceiveModal] = useState(false);
-
   const {
     currency: primaryCurrency,
     numberOfDecimals: primaryNumberOfDecimals,
@@ -118,50 +107,12 @@ const AssetList = ({ onClickAsset }) => {
     token.string = roundToDecimalPlacesRemovingExtraZeroes(token.string, 5);
   });
   const balanceIsZero = Number(totalFiatBalance) === 0;
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const isBuyableChain = useSelector(getIsBuyableChain);
   const shouldShowBuy = isBuyableChain && balanceIsZero;
-  const shouldShowReceive = balanceIsZero;
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  const { openBuyCryptoInPdapp } = useRamps();
-  const defaultSwapsToken = useSelector(getSwapsDefaultToken);
   ///: END:ONLY_INCLUDE_IF
 
-  useEffect(() => {
-    if (shouldShowBuy) {
-      trackEvent({
-        event: MetaMetricsEventName.EmptyBuyBannerDisplayed,
-        category: MetaMetricsEventCategory.Navigation,
-        properties: {
-          chain_id: chainId,
-          locale: currentLocale,
-          network: nickname,
-          referrer: ORIGIN_METAMASK,
-        },
-      });
-    }
-    if (shouldShowReceive) {
-      trackEvent({
-        event: MetaMetricsEventName.EmptyReceiveBannerDisplayed,
-        category: MetaMetricsEventCategory.Navigation,
-        properties: {
-          chain_id: chainId,
-          locale: currentLocale,
-          network: nickname,
-          referrer: ORIGIN_METAMASK,
-        },
-      });
-    }
-  }, [
-    shouldShowBuy,
-    shouldShowReceive,
-    trackEvent,
-    chainId,
-    nickname,
-    currentLocale,
-  ]);
-
   let isStakeable = isMainnet;
-
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   isStakeable = false;
   ///: END:ONLY_INCLUDE_IF
@@ -175,53 +126,13 @@ const AssetList = ({ onClickAsset }) => {
             margin={4}
           />
         )}
-      {shouldShowBuy || shouldShowReceive ? (
-        <Box
-          paddingInlineStart={4}
-          paddingInlineEnd={4}
-          display={Display.Flex}
-          gap={2}
-        >
-          {
-            ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-            shouldShowBuy ? (
-              <AssetListConversionButton
-                variant={ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.BUY}
-                onClick={() => {
-                  openBuyCryptoInPdapp();
-                  trackEvent({
-                    event: MetaMetricsEventName.NavBuyButtonClicked,
-                    category: MetaMetricsEventCategory.Navigation,
-                    properties: {
-                      location: 'Home',
-                      text: 'Buy',
-                      chain_id: chainId,
-                      token_symbol: defaultSwapsToken,
-                    },
-                  });
-                }}
-              />
-            ) : null
-            ///: END:ONLY_INCLUDE_IF
-          }
-          {
-            ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-            shouldShowReceive ? (
-              <AssetListConversionButton
-                variant={ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.RECEIVE}
-                onClick={() => setShowReceiveModal(true)}
-              />
-            ) : null
-            ///: END:ONLY_INCLUDE_IF
-          }
-          {showReceiveModal ? (
-            <ReceiveModal
-              address={selectedAddress}
-              onClose={() => setShowReceiveModal(false)}
-            />
-          ) : null}
-        </Box>
-      ) : null}
+      {
+        ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+        shouldShowBuy ? (
+          <RampsCard variant={RAMPS_CARD_VARIANT_TYPES.TOKEN} />
+        ) : null
+        ///: END:ONLY_INCLUDE_IF
+      }
       <TokenListItem
         onClick={() => onClickAsset(nativeCurrency)}
         title={nativeCurrency}
@@ -269,9 +180,18 @@ const AssetList = ({ onClickAsset }) => {
           });
         }}
       />
-      <Box marginTop={detectedTokens.length > 0 ? 0 : 4}>
-        <ImportTokenLink margin={4} marginBottom={2} />
-      </Box>
+      {balanceIsZero && (
+        <ReceiveTokenLink
+          margin={4}
+          marginBottom={0}
+          marginTop={detectedTokens.length > 0 ? 0 : 4}
+        />
+      )}
+      <ImportTokenLink
+        margin={4}
+        marginBottom={2}
+        marginTop={detectedTokens.length > 0 && !balanceIsZero ? 0 : 2}
+      />
       {showDetectedTokens && (
         <DetectedToken setShowDetectedTokens={setShowDetectedTokens} />
       )}
diff --git a/ui/components/app/asset-list/asset-list.buy-receive.test.js b/ui/components/app/asset-list/asset-list.ramps-card.test.js
similarity index 61%
rename from ui/components/app/asset-list/asset-list.buy-receive.test.js
rename to ui/components/app/asset-list/asset-list.ramps-card.test.js
index b2de5f5ef3d9..1f795b4a992c 100644
--- a/ui/components/app/asset-list/asset-list.buy-receive.test.js
+++ b/ui/components/app/asset-list/asset-list.ramps-card.test.js
@@ -4,6 +4,7 @@ import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
 import { CHAIN_IDS, NETWORK_TYPES } from '../../../../shared/constants/network';
 import { useIsOriginalNativeTokenSymbol } from '../../../hooks/useIsOriginalNativeTokenSymbol';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import AssetList from './asset-list';
 
 // Specific to just the ETH FIAT conversion
@@ -15,8 +16,11 @@ jest.mock('../../../hooks/useIsOriginalNativeTokenSymbol', () => {
   };
 });
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = (
-  selectedAddress = mockState.metamask.selectedAddress,
+  selectedInternalAccount = mockSelectedInternalAccount,
   balance = ETH_BALANCE,
   chainId = CHAIN_IDS.MAINNET,
 ) => {
@@ -27,10 +31,9 @@ const render = (
       providerConfig: { chainId, ticker: 'ETH', type: NETWORK_TYPES.MAINNET },
       accountsByChainId: {
         [CHAIN_IDS.MAINNET]: {
-          [selectedAddress]: { balance },
+          [selectedInternalAccount.address]: { balance },
         },
       },
-      selectedAddress,
     },
   };
   const store = configureStore(state);
@@ -40,31 +43,19 @@ const render = (
   );
 };
 
-describe('AssetList Buy/Receive', () => {
+describe('AssetList Ramps Card', () => {
   useIsOriginalNativeTokenSymbol.mockReturnValue(true);
 
-  it('shows Buy and Receive when the account is empty', () => {
-    const { queryByText } = render(
-      '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
-      '0x0',
-    );
-    expect(queryByText('Buy')).toBeInTheDocument();
-    expect(queryByText('Receive')).toBeInTheDocument();
-  });
-
-  it('shows only Receive when chainId is not buyable', () => {
+  it('shows the ramp card when the account is empty', () => {
     const { queryByText } = render(
       '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
       '0x0',
-      '0x8675309', // Custom chain ID that isn't buyable
     );
-    expect(queryByText('Buy')).not.toBeInTheDocument();
-    expect(queryByText('Receive')).toBeInTheDocument();
+    expect(queryByText('Fund your wallet')).toBeInTheDocument();
   });
 
-  it('shows neither when the account has a balance', () => {
+  it('does not show the ramp card when the account has a balance', () => {
     const { queryByText } = render();
-    expect(queryByText('Buy')).not.toBeInTheDocument();
-    expect(queryByText('Receive')).not.toBeInTheDocument();
+    expect(queryByText('Fund your wallet')).not.toBeInTheDocument();
   });
 });
diff --git a/ui/components/app/asset-list/asset-list.test.js b/ui/components/app/asset-list/asset-list.test.js
index 3ad49e8120c8..4a92aea93d61 100644
--- a/ui/components/app/asset-list/asset-list.test.js
+++ b/ui/components/app/asset-list/asset-list.test.js
@@ -6,6 +6,7 @@ import mockState from '../../../../test/data/mock-state.json';
 import { CHAIN_IDS, NETWORK_TYPES } from '../../../../shared/constants/network';
 import { useIsOriginalNativeTokenSymbol } from '../../../hooks/useIsOriginalNativeTokenSymbol';
 import { getTokenSymbol } from '../../../store/actions';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import AssetList from './asset-list';
 
 // Specific to just the ETH FIAT conversion
@@ -20,32 +21,34 @@ const USDC_CONTRACT = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
 const LINK_CONTRACT = '0x514910771AF9Ca656af840dff83E8264EcF986CA';
 const WBTC_CONTRACT = '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599';
 
+let mockTokens = [
+  {
+    address: USDC_CONTRACT,
+    decimals: 6,
+    symbol: 'USDC',
+    string: USDC_BALANCE, // $199.36
+  },
+  {
+    address: LINK_CONTRACT,
+    aggregators: [],
+    decimals: 18,
+    symbol: 'LINK',
+    string: LINK_BALANCE, // $824.78
+  },
+  {
+    address: WBTC_CONTRACT,
+    aggregators: [],
+    decimals: 8,
+    symbol: 'WBTC',
+    string: WBTC_BALANCE, // $63,381.02
+  },
+];
+
 jest.mock('../../../hooks/useTokenTracker', () => {
   return {
     useTokenTracker: () => ({
       loading: false,
-      tokensWithBalances: [
-        {
-          address: USDC_CONTRACT,
-          decimals: 6,
-          symbol: 'USDC',
-          string: USDC_BALANCE, // $199.36
-        },
-        {
-          address: LINK_CONTRACT,
-          aggregators: [],
-          decimals: 18,
-          symbol: 'LINK',
-          string: LINK_BALANCE, // $824.78
-        },
-        {
-          address: WBTC_CONTRACT,
-          aggregators: [],
-          decimals: 8,
-          symbol: 'WBTC',
-          string: WBTC_BALANCE, // $63,381.02
-        },
-      ],
+      tokensWithBalances: mockTokens,
       error: null,
     }),
   };
@@ -63,11 +66,10 @@ jest.mock('../../../store/actions', () => {
   };
 });
 
-const render = (
-  selectedAddress = mockState.metamask.selectedAddress,
-  balance = ETH_BALANCE,
-  chainId = CHAIN_IDS.MAINNET,
-) => {
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
+const render = (balance = ETH_BALANCE, chainId = CHAIN_IDS.MAINNET) => {
   const state = {
     ...mockState,
     metamask: {
@@ -80,7 +82,7 @@ const render = (
       },
       accountsByChainId: {
         [CHAIN_IDS.MAINNET]: {
-          [selectedAddress]: { balance },
+          [mockSelectedInternalAccount.address]: { balance },
         },
       },
       contractExchangeRates: {
@@ -88,7 +90,6 @@ const render = (
         [LINK_CONTRACT]: 0.00423239,
         [WBTC_CONTRACT]: 16.66575,
       },
-      selectedAddress,
     },
   };
   const store = configureStore(state);
@@ -123,4 +124,15 @@ describe('AssetList', () => {
       expect(screen.getByText('Refresh list')).toBeInTheDocument();
     });
   });
+
+  it('shows the receive button when the user balance is zero', async () => {
+    mockTokens = [];
+
+    await act(async () => {
+      render(mockState.metamask.selectedAddress, '0x0', CHAIN_IDS.MAINNET);
+    });
+    await waitFor(() => {
+      expect(screen.getByText('Receive tokens')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/ui/components/app/basic-configuration-modal/basic-configuration-modal.stories.tsx b/ui/components/app/basic-configuration-modal/basic-configuration-modal.stories.tsx
new file mode 100644
index 000000000000..bb5bd4418de4
--- /dev/null
+++ b/ui/components/app/basic-configuration-modal/basic-configuration-modal.stories.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureStore from '../../../store/store';
+import testData from '../../../../.storybook/test-data';
+import { BasicConfigurationModal } from '.';
+
+const store = configureStore(testData);
+
+export default {
+  title: 'Components/BasicConfigurationModal',
+  decorators: [(storyFn) => <Provider store={store}>{storyFn()}</Provider>],
+  component: BasicConfigurationModal,
+};
+
+export const DefaultStory = () => <BasicConfigurationModal />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/basic-configuration-modal/basic-configuration-modal.tsx b/ui/components/app/basic-configuration-modal/basic-configuration-modal.tsx
new file mode 100644
index 000000000000..3918e81e81a7
--- /dev/null
+++ b/ui/components/app/basic-configuration-modal/basic-configuration-modal.tsx
@@ -0,0 +1,153 @@
+import React, { useMemo, useState } from 'react';
+import { useLocation } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  Display,
+  FlexDirection,
+  AlignItems,
+  JustifyContent,
+  TextVariant,
+  BlockSize,
+  IconColor,
+  FontWeight,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { toggleExternalServices } from '../../../store/actions';
+import {
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  Modal,
+  Box,
+  Text,
+  ModalFooter,
+  Button,
+  IconName,
+  ButtonVariant,
+  Icon,
+  IconSize,
+  Checkbox,
+  ButtonSize,
+  Label,
+} from '../../component-library';
+import { getUseExternalServices } from '../../../selectors';
+import {
+  hideBasicFunctionalityModal,
+  onboardingToggleBasicFunctionalityOff,
+} from '../../../ducks/app/app';
+import { ONBOARDING_PRIVACY_SETTINGS_ROUTE } from '../../../helpers/constants/routes';
+
+export function BasicConfigurationModal() {
+  const t = useI18nContext();
+  const [hasAgreed, setHasAgreed] = useState(false);
+  const dispatch = useDispatch();
+  const isExternalServicesEnabled = useSelector(getUseExternalServices);
+  const { pathname } = useLocation();
+  const onboardingFlow = useMemo(() => {
+    return pathname === ONBOARDING_PRIVACY_SETTINGS_ROUTE;
+  }, [pathname]);
+
+  function closeModal() {
+    dispatch(hideBasicFunctionalityModal());
+  }
+
+  return (
+    <Modal onClose={closeModal} data-testid="dapp-permission-modal" isOpen>
+      <ModalOverlay />
+      <ModalContent
+        modalDialogProps={{
+          display: Display.Flex,
+          flexDirection: FlexDirection.Column,
+        }}
+      >
+        <ModalHeader
+          paddingBottom={4}
+          paddingRight={4}
+          paddingLeft={4}
+          onClose={closeModal}
+        >
+          <Box
+            display={Display.Flex}
+            flexDirection={FlexDirection.Column}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+            gap={4}
+          >
+            <Icon
+              size={IconSize.Xl}
+              name={IconName.Danger}
+              color={IconColor.errorDefault}
+            />
+            <Text variant={TextVariant.headingSm}>
+              {isExternalServicesEnabled
+                ? t('basicConfigurationModalHeadingOff')
+                : t('basicConfigurationModalHeadingOn')}
+            </Text>
+          </Box>
+        </ModalHeader>
+
+        <Box
+          marginLeft={4}
+          marginRight={4}
+          marginBottom={4}
+          display={Display.Flex}
+          gap={4}
+          flexDirection={FlexDirection.Column}
+        >
+          <Text variant={TextVariant.bodySm}>
+            {isExternalServicesEnabled
+              ? t('basicConfigurationModalDisclaimerOff')
+              : t('basicConfigurationModalDisclaimerOn')}
+          </Text>
+          {isExternalServicesEnabled && (
+            <Box display={Display.Flex} alignItems={AlignItems.center} gap={2}>
+              <Checkbox
+                id="basic-configuration-checkbox"
+                isChecked={hasAgreed}
+                onClick={() => setHasAgreed((prevValue) => !prevValue)}
+              />
+              <Label
+                htmlFor="basic-configuration-checkbox"
+                fontWeight={FontWeight.Normal}
+                variant={TextVariant.bodySm}
+              >
+                {t('basicConfigurationModalCheckbox')}
+              </Label>
+            </Box>
+          )}
+        </Box>
+
+        <ModalFooter>
+          <Box display={Display.Flex} gap={4}>
+            <Button
+              size={ButtonSize.Lg}
+              width={BlockSize.Half}
+              variant={ButtonVariant.Secondary}
+              onClick={closeModal}
+            >
+              {t('cancel')}
+            </Button>
+            <Button
+              size={ButtonSize.Lg}
+              disabled={!hasAgreed && isExternalServicesEnabled}
+              width={BlockSize.Half}
+              variant={ButtonVariant.Primary}
+              onClick={() => {
+                if (onboardingFlow) {
+                  dispatch(hideBasicFunctionalityModal());
+                  dispatch(onboardingToggleBasicFunctionalityOff());
+                } else {
+                  closeModal();
+                  dispatch(toggleExternalServices(!isExternalServicesEnabled));
+                }
+              }}
+              danger={isExternalServicesEnabled}
+            >
+              {isExternalServicesEnabled ? t('turnOff') : t('turnOn')}
+            </Button>
+          </Box>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/ui/components/app/basic-configuration-modal/index.ts b/ui/components/app/basic-configuration-modal/index.ts
new file mode 100644
index 000000000000..847e5e18197c
--- /dev/null
+++ b/ui/components/app/basic-configuration-modal/index.ts
@@ -0,0 +1 @@
+export { BasicConfigurationModal } from './basic-configuration-modal';
diff --git a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.stories.js b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.stories.js
index 0b2d541d771e..1c8f479e63f3 100644
--- a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.stories.js
+++ b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.stories.js
@@ -11,14 +11,18 @@ import {
 } from '../../../../shared/constants/gas';
 import { decGWEIToHexWEI } from '../../../../shared/modules/conversion.utils';
 import { GasFeeContextProvider } from '../../../contexts/gasFee';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import CancelSpeedupPopover from './cancel-speedup-popover';
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const store = configureStore({
   metamask: {
     ...mockState.metamask,
     accounts: {
-      [mockState.metamask.selectedAddress]: {
-        address: mockState.metamask.selectedAddress,
+      [mockState]: {
+        address: mockSelectedInternalAccount.address,
         balance: '0x1F4',
       },
     },
diff --git a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.test.js b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.test.js
index 23a22e3b6bd5..9a6c6c7fd25d 100644
--- a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.test.js
+++ b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.test.js
@@ -16,6 +16,7 @@ import {
   decGWEIToHexWEI,
   hexWEIToDecETH,
 } from '../../../../shared/modules/conversion.utils';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import CancelSpeedupPopover from './cancel-speedup-popover';
 
 const MAXFEEPERGAS_ABOVE_MOCK_MEDIUM_HEX = '0x174876e800';
@@ -74,6 +75,9 @@ jest.mock('../../../contexts/transaction-modal', () => ({
 
 jest.mock('../../ui/info-tooltip', () => jest.fn(() => null));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = (
   props,
   maxFeePerGas = MOCK_SUGGESTED_MEDIUM_MAXFEEPERGAS_HEX_WEI,
@@ -82,8 +86,8 @@ const render = (
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/components/app/confirm/info/info.test.tsx b/ui/components/app/confirm/info/info.test.tsx
index a5af2548d1c9..113d964fd1f6 100644
--- a/ui/components/app/confirm/info/info.test.tsx
+++ b/ui/components/app/confirm/info/info.test.tsx
@@ -26,6 +26,8 @@ const mockRowConfigs: ConfirmInfoRowConfig[] = [
 ];
 
 describe('ConfirmInfo', () => {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const render = (storeOverrides: Record<string, any> = {}) => {
     const store = configureStore({
       ...mockState.metamask,
diff --git a/ui/components/app/confirm/info/info.tsx b/ui/components/app/confirm/info/info.tsx
index 8c1c386de0c4..9edd0a22ec49 100644
--- a/ui/components/app/confirm/info/info.tsx
+++ b/ui/components/app/confirm/info/info.tsx
@@ -38,6 +38,8 @@ type ConfirmInfoTypeProps =
   | ConfirmInfoRowUrlProps
   | ConfirmInfoRowValueDoubleProps;
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const TYPE_TO_COMPONENT: Record<ConfirmInfoRowType, any> = {
   [ConfirmInfoRowType.Address]: ({ address }: ConfirmInfoRowAddressProps) => {
     return <ConfirmInfoRowAddress address={address} />;
diff --git a/ui/components/app/confirm/info/row/__snapshots__/url.test.tsx.snap b/ui/components/app/confirm/info/row/__snapshots__/url.test.tsx.snap
index 1478da7f18f4..f359ba8e1857 100644
--- a/ui/components/app/confirm/info/row/__snapshots__/url.test.tsx.snap
+++ b/ui/components/app/confirm/info/row/__snapshots__/url.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ConfirmInfoRowUrl renders a URL, protocol, and warning icon when the protocol is "http" 1`] = `
+exports[`ConfirmInfoRowUrl renders a URL, and warning icon when the protocol is "http" 1`] = `
 <div>
   <div
     class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
@@ -17,7 +17,7 @@ exports[`ConfirmInfoRowUrl renders a URL, protocol, and warning icon when the pr
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
     >
-      http://www.example.com/
+      www.example.com/
     </p>
   </div>
 </div>
@@ -31,7 +31,7 @@ exports[`ConfirmInfoRowUrl should match snapshot 1`] = `
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
     >
-      https://example.com
+      example.com
     </p>
   </div>
 </div>
diff --git a/ui/components/app/confirm/info/row/address.test.tsx b/ui/components/app/confirm/info/row/address.test.tsx
index 5206c1b61ce2..4415541e02b5 100644
--- a/ui/components/app/confirm/info/row/address.test.tsx
+++ b/ui/components/app/confirm/info/row/address.test.tsx
@@ -8,6 +8,8 @@ import { ConfirmInfoRowAddress } from './address';
 import { TEST_ADDRESS } from './constants';
 
 const render = (
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   storeOverrides: Record<string, any> = {},
   address: string = TEST_ADDRESS,
 ) => {
diff --git a/ui/components/app/confirm/info/row/alert-row/__snapshots__/alert-row.test.tsx.snap b/ui/components/app/confirm/info/row/alert-row/__snapshots__/alert-row.test.tsx.snap
new file mode 100644
index 000000000000..e01093f4c930
--- /dev/null
+++ b/ui/components/app/confirm/info/row/alert-row/__snapshots__/alert-row.test.tsx.snap
@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AlertRow matches snapshot with no alert 1`] = `
+<div>
+  <div
+    class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+    style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
+  >
+    <div
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+    >
+      <p
+        class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+      >
+        Key
+      </p>
+    </div>
+    <p
+      class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+    >
+      value
+    </p>
+  </div>
+</div>
+`;
diff --git a/ui/components/app/confirm/info/row/alert-row/alert-row.stories.tsx b/ui/components/app/confirm/info/row/alert-row/alert-row.stories.tsx
new file mode 100644
index 000000000000..8429ceaad731
--- /dev/null
+++ b/ui/components/app/confirm/info/row/alert-row/alert-row.stories.tsx
@@ -0,0 +1,127 @@
+import React from 'react';
+import { ConfirmInfoRowVariant } from '../row';
+import { AlertRow } from './alert-row';
+import { Severity } from '../../../../../../helpers/constants/design-system';
+import { Alert } from '../../../../../../ducks/confirm-alerts/confirm-alerts';
+import configureStore from '../../../../../../store/store';
+import { Provider } from 'react-redux';
+import { Meta } from '@storybook/react';
+
+const LABEL_FROM_MOCK = 'From';
+const DATA_FROM_MOCK = 'Data';
+const CONTRACT_FROM_MOCK = 'Contract';
+const alertsMock: Alert[] = [
+  {
+    key: LABEL_FROM_MOCK,
+    field: LABEL_FROM_MOCK,
+    severity: Severity.Danger,
+    message: 'Description of what may happen if this alert was ignored',
+    reason: 'Reason for the alert 1',
+    alertDetails: [
+      'We found the contract Petname 0xEqT3b9773b1763efa556f55ccbeb20441962d82x to be malicious',
+      'Operator is an externally owned account (EOA) ',
+      'Operator is untrusted according to previous activity',
+    ],
+  },
+  {
+    key: 'Data',
+    field: 'Data',
+    severity: Severity.Warning,
+    message: 'Alert 2',
+    alertDetails: ['detail 1 warning', 'detail 2 warning'],
+  },
+  {
+    key: 'Contract',
+    field: 'Contract',
+    severity: Severity.Info,
+    message: 'Alert Info',
+    alertDetails: ['detail 1 info', 'detail info'],
+  },
+];
+const OWNER_ID_MOCK = '123';
+const storeMock = configureStore({
+  confirmAlerts: {
+    alerts: { [OWNER_ID_MOCK]: alertsMock },
+    confirmed: {
+      [OWNER_ID_MOCK]: {
+        [LABEL_FROM_MOCK]: false,
+        [DATA_FROM_MOCK]: false,
+        [CONTRACT_FROM_MOCK]: false,
+      },
+    },
+  },
+  confirm: {
+    currentConfirmation: {
+      id: OWNER_ID_MOCK,
+      status: 'unapproved',
+      time: new Date().getTime(),
+      type: 'json_request',
+    },
+  },
+});
+
+const ConfirmInfoRowStory = {
+  title: 'Components/App/Confirm/AlertRow',
+
+  component: AlertRow,
+  argTypes: {
+    variant: {
+      control: 'select',
+      options: Object.values(ConfirmInfoRowVariant),
+    },
+    label: {
+      control: 'text',
+    },
+    children: {
+      control: 'text',
+    },
+  },
+  decorators: [(story) => <Provider store={storeMock}>{story()}</Provider>],
+} as Meta<typeof AlertRow>;
+
+export const DefaultStory = (args) => <AlertRow {...args} />;
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  label: 'Key',
+  children: 'Value',
+};
+
+export default ConfirmInfoRowStory;
+
+/**
+ * Row with Critical Alert.
+ */
+export const AlertRowCritical = DefaultStory.bind({});
+AlertRowCritical.args = {
+  label: LABEL_FROM_MOCK,
+  children: 'Value',
+  alertKey: LABEL_FROM_MOCK,
+  ownerId: OWNER_ID_MOCK,
+  variant: ConfirmInfoRowVariant.Critical,
+};
+
+/**
+ * Row with Non-Critical Alert.
+ */
+export const AlertRowWarning = DefaultStory.bind({});
+AlertRowWarning.args = {
+  label: DATA_FROM_MOCK,
+  children: 'Value',
+  alertKey: DATA_FROM_MOCK,
+  ownerId: OWNER_ID_MOCK,
+  variant: ConfirmInfoRowVariant.Warning,
+};
+
+/**
+ * Row with Informative Alert.
+ */
+export const AlertRowInformative = DefaultStory.bind({});
+AlertRowInformative.args = {
+  label: CONTRACT_FROM_MOCK,
+  children: 'Value',
+  alertKey: CONTRACT_FROM_MOCK,
+  ownerId: OWNER_ID_MOCK,
+  variant: ConfirmInfoRowVariant.Default,
+};
diff --git a/ui/components/app/confirm/info/row/alert-row/alert-row.test.tsx b/ui/components/app/confirm/info/row/alert-row/alert-row.test.tsx
new file mode 100644
index 000000000000..8d6e5688f733
--- /dev/null
+++ b/ui/components/app/confirm/info/row/alert-row/alert-row.test.tsx
@@ -0,0 +1,109 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent } from '@testing-library/react';
+import { Text } from '../../../../../component-library';
+import { renderWithProvider } from '../../../../../../../test/lib/render-helpers';
+import { Severity } from '../../../../../../helpers/constants/design-system';
+import { AlertRow, AlertRowProps } from './alert-row';
+
+describe('AlertRow', () => {
+  const OWNER_ID_MOCK = '123';
+  const OWNER_ID_NO_ALERT_MOCK = '000';
+  const KEY_ALERT_KEY_MOCK = 'Key';
+  const ALERT_MESSAGE_MOCK = 'Alert 1';
+  const alertsMock = [
+    {
+      key: KEY_ALERT_KEY_MOCK,
+      field: KEY_ALERT_KEY_MOCK,
+      severity: Severity.Warning,
+      message: ALERT_MESSAGE_MOCK,
+      reason: 'Reason 1',
+      alertDetails: ['Detail 1', 'Detail 2'],
+    },
+  ];
+  const renderAlertRow = (
+    props?: Partial<AlertRowProps>,
+    state?: Record<string, unknown>,
+  ) => {
+    const STATE_MOCK = {
+      confirmAlerts: {
+        alerts: { [OWNER_ID_MOCK]: alertsMock },
+        confirmed: {
+          [OWNER_ID_MOCK]: { [KEY_ALERT_KEY_MOCK]: false },
+        },
+      },
+      confirm: {
+        currentConfirmation: {
+          id: OWNER_ID_MOCK,
+          status: 'unapproved',
+          time: new Date().getTime(),
+          type: 'json_request',
+        },
+      },
+      ...state,
+    };
+
+    const mockStore = configureMockStore([])(STATE_MOCK);
+    return renderWithProvider(
+      <AlertRow
+        label={KEY_ALERT_KEY_MOCK}
+        children={<Text>value</Text>}
+        ownerId={OWNER_ID_NO_ALERT_MOCK}
+        alertKey={KEY_ALERT_KEY_MOCK}
+        {...props}
+      />,
+      mockStore,
+    );
+  };
+
+  it('matches snapshot with no alert', () => {
+    const { container } = renderAlertRow();
+    expect(container).toMatchSnapshot();
+  });
+
+  describe('Alerts', () => {
+    it('renders row with alert', () => {
+      const { getByTestId } = renderAlertRow({
+        alertKey: KEY_ALERT_KEY_MOCK,
+        ownerId: OWNER_ID_MOCK,
+      });
+      expect(getByTestId('inline-alert')).toBeDefined();
+    });
+
+    it('does not render when alert properties are not provided', () => {
+      const { queryByTestId } = renderAlertRow();
+      expect(queryByTestId('inline-alert')).toBeNull();
+    });
+
+    describe('Alert modal visibility:', () => {
+      it('show when clicked in the inline alert', () => {
+        const { getByTestId } = renderAlertRow({
+          alertKey: KEY_ALERT_KEY_MOCK,
+          ownerId: OWNER_ID_MOCK,
+        });
+        fireEvent.click(getByTestId('inline-alert'));
+        expect(getByTestId('alert-modal-button')).toBeDefined();
+      });
+
+      it('hide when clicked in the `Got it` button', () => {
+        const { getByTestId, queryByTestId } = renderAlertRow(
+          {
+            alertKey: KEY_ALERT_KEY_MOCK,
+            ownerId: OWNER_ID_MOCK,
+          },
+          {
+            confirmAlerts: {
+              alerts: { [OWNER_ID_MOCK]: alertsMock },
+              confirmed: {
+                [OWNER_ID_MOCK]: { [KEY_ALERT_KEY_MOCK]: true },
+              },
+            },
+          },
+        );
+        fireEvent.click(getByTestId('inline-alert'));
+        fireEvent.click(getByTestId('alert-modal-button'));
+        expect(queryByTestId('alert-modal-button')).toBeNull();
+      });
+    });
+  });
+});
diff --git a/ui/components/app/confirm/info/row/alert-row/alert-row.tsx b/ui/components/app/confirm/info/row/alert-row/alert-row.tsx
new file mode 100644
index 000000000000..2982eb0b7ba8
--- /dev/null
+++ b/ui/components/app/confirm/info/row/alert-row/alert-row.tsx
@@ -0,0 +1,86 @@
+import React, { useState } from 'react';
+import {
+  Severity,
+  TextColor,
+} from '../../../../../../helpers/constants/design-system';
+import InlineAlert from '../../../../confirmations/alerts/inline-alert/inline-alert';
+import useAlerts from '../../../../../../hooks/useAlerts';
+import {
+  ConfirmInfoRow,
+  ConfirmInfoRowProps,
+  ConfirmInfoRowVariant,
+} from '../row';
+import { Box } from '../../../../../component-library';
+import { MultipleAlertModal } from '../../../../confirmations/alerts/multiple-alert-modal';
+
+export type AlertRowProps = ConfirmInfoRowProps & {
+  alertKey: string;
+  ownerId: string;
+};
+
+export function getAlertTextColors(
+  variant?: ConfirmInfoRowVariant | Severity,
+): TextColor {
+  switch (variant) {
+    case ConfirmInfoRowVariant.Critical:
+    case Severity.Danger:
+      return TextColor.errorDefault;
+    case ConfirmInfoRowVariant.Warning:
+    case Severity.Warning:
+      return TextColor.warningDefault;
+    case ConfirmInfoRowVariant.Default:
+    case Severity.Info:
+      return TextColor.infoDefault;
+    default:
+      return TextColor.textDefault;
+  }
+}
+
+export const AlertRow = ({
+  alertKey,
+  ownerId,
+  variant,
+  ...rowProperties
+}: AlertRowProps) => {
+  const { getFieldAlerts } = useAlerts(ownerId);
+  const fieldAlerts = getFieldAlerts(alertKey);
+  const hasFieldAlert = fieldAlerts.length > 0;
+  const selectedAlertSeverity = fieldAlerts[0]?.severity;
+
+  const [alertModalVisible, setAlertModalVisible] = useState<boolean>(false);
+
+  const handleCloseModal = () => {
+    setAlertModalVisible(false);
+  };
+
+  const handleOpenModal = () => {
+    setAlertModalVisible(true);
+  };
+
+  const confirmInfoRowProps = {
+    ...rowProperties,
+    style: { background: 'transparent', ...rowProperties.style },
+    color: getAlertTextColors(variant ?? selectedAlertSeverity),
+    variant,
+  };
+
+  const inlineAlert = hasFieldAlert ? (
+    <Box marginLeft={1}>
+      <InlineAlert onClick={handleOpenModal} severity={selectedAlertSeverity} />
+    </Box>
+  ) : null;
+
+  return (
+    <>
+      {alertModalVisible && (
+        <MultipleAlertModal
+          alertKey={alertKey}
+          ownerId={ownerId}
+          onFinalAcknowledgeClick={handleCloseModal}
+          onClose={handleCloseModal}
+        />
+      )}
+      <ConfirmInfoRow {...confirmInfoRowProps} labelChildren={inlineAlert} />
+    </>
+  );
+};
diff --git a/ui/components/app/confirm/info/row/currency.test.tsx b/ui/components/app/confirm/info/row/currency.test.tsx
index ab1011ac178c..9fad8957a97f 100644
--- a/ui/components/app/confirm/info/row/currency.test.tsx
+++ b/ui/components/app/confirm/info/row/currency.test.tsx
@@ -6,15 +6,12 @@ import configureStore from '../../../../../store/store';
 
 import { ConfirmInfoRowCurrency } from './currency';
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const render = (props: Record<string, any> = {}) => {
+  const { metamask } = mockState;
   const store = configureStore({
-    metamask: {
-      ...mockState.metamask,
-      preferences: {
-        ...mockState.metamask.preferences,
-        useNativeCurrencyAsPrimaryCurrency: false,
-      },
-    },
+    metamask,
   });
 
   return renderWithProvider(
diff --git a/ui/components/app/confirm/info/row/currency.tsx b/ui/components/app/confirm/info/row/currency.tsx
index 0e6cc2960b31..3de8060cec5e 100644
--- a/ui/components/app/confirm/info/row/currency.tsx
+++ b/ui/components/app/confirm/info/row/currency.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { PRIMARY } from '../../../../../helpers/constants/common';
 import {
   AlignItems,
   Display,
@@ -12,6 +13,7 @@ import CurrencyDisplay from '../../../../ui/currency-display/currency-display.co
 export type ConfirmInfoRowCurrencyProps = {
   value: number | string;
   currency?: string;
+  dataTestId?: string;
 };
 
 // todo: the component currently takes care of displaying value in the currency passed
@@ -21,6 +23,7 @@ export type ConfirmInfoRowCurrencyProps = {
 export const ConfirmInfoRowCurrency = ({
   value,
   currency,
+  dataTestId,
 }: ConfirmInfoRowCurrencyProps) => (
   <Box
     display={Display.Flex}
@@ -30,11 +33,12 @@ export const ConfirmInfoRowCurrency = ({
       columnGap: '8px',
       fontSize: 'var(--font-size-3)',
     }}
+    data-testid={dataTestId}
   >
     {currency ? (
       <CurrencyDisplay currency={currency} value={`${value}`} />
     ) : (
-      <UserPreferencedCurrencyDisplay value={`${value}`} />
+      <UserPreferencedCurrencyDisplay type={PRIMARY} value={`${value}`} />
     )}
   </Box>
 );
diff --git a/ui/components/app/confirm/info/row/row.tsx b/ui/components/app/confirm/info/row/row.tsx
index 25e535869c2b..4dac952c2268 100644
--- a/ui/components/app/confirm/info/row/row.tsx
+++ b/ui/components/app/confirm/info/row/row.tsx
@@ -1,6 +1,12 @@
 import React, { createContext } from 'react';
 import Tooltip from '../../../../ui/tooltip/tooltip';
-import { Box, Icon, IconName, Text } from '../../../../component-library';
+import {
+  Box,
+  Icon,
+  IconName,
+  IconSize,
+  Text,
+} from '../../../../component-library';
 import {
   AlignItems,
   BackgroundColor,
@@ -28,6 +34,8 @@ export type ConfirmInfoRowProps = {
   tooltip?: string;
   variant?: ConfirmInfoRowVariant;
   style?: React.CSSProperties;
+  labelChildren?: React.ReactNode;
+  color?: TextColor;
 };
 
 const BACKGROUND_COLORS = {
@@ -64,6 +72,8 @@ export const ConfirmInfoRow = ({
   variant = ConfirmInfoRowVariant.Default,
   tooltip,
   style,
+  labelChildren,
+  color,
 }: ConfirmInfoRowProps) => (
   <ConfirmInfoRowContext.Provider value={{ variant }}>
     <Box
@@ -78,7 +88,7 @@ export const ConfirmInfoRow = ({
       marginBottom={2}
       paddingLeft={2}
       paddingRight={2}
-      color={TEXT_COLORS[variant] as TextColor}
+      color={color ?? (TEXT_COLORS[variant] as TextColor)}
       style={{
         overflowWrap: OverflowWrap.Anywhere,
         minHeight: '24px',
@@ -94,12 +104,18 @@ export const ConfirmInfoRow = ({
         <Text variant={TextVariant.bodyMdMedium} color={TextColor.inherit}>
           {label}
         </Text>
+        {labelChildren}
         {tooltip && tooltip.length > 0 && (
-          <Tooltip title={tooltip} style={{ display: 'flex' }}>
+          <Tooltip
+            position="bottom"
+            title={tooltip}
+            style={{ display: 'flex' }}
+          >
             <Icon
               name={TOOLTIP_ICONS[variant]}
               marginLeft={1}
               color={TOOLTIP_ICON_COLORS[variant] as unknown as IconColor}
+              size={IconSize.Sm}
             />
           </Tooltip>
         )}
diff --git a/ui/components/app/confirm/info/row/text.tsx b/ui/components/app/confirm/info/row/text.tsx
index 17bd204f318c..c9f046d34f28 100644
--- a/ui/components/app/confirm/info/row/text.tsx
+++ b/ui/components/app/confirm/info/row/text.tsx
@@ -19,7 +19,9 @@ export const ConfirmInfoRowText = ({ text }: ConfirmInfoRowTextProps) => {
       flexWrap={FlexWrap.Wrap}
       gap={2}
     >
-      <Text color={TextColor.inherit}>{text}</Text>
+      <Text color={TextColor.inherit} style={{ whiteSpace: 'pre-wrap' }}>
+        {text}
+      </Text>
     </Box>
   );
 };
diff --git a/ui/components/app/confirm/info/row/url.test.tsx b/ui/components/app/confirm/info/row/url.test.tsx
index 8307dd3342e2..77f6ea85477a 100644
--- a/ui/components/app/confirm/info/row/url.test.tsx
+++ b/ui/components/app/confirm/info/row/url.test.tsx
@@ -14,21 +14,21 @@ describe('ConfirmInfoRowUrl', () => {
     const { getByText } = render(
       <ConfirmInfoRowUrl url="https://www.example.com" />,
     );
-    expect(getByText('https://www.example.com')).toBeInTheDocument();
+    expect(getByText('www.example.com')).toBeInTheDocument();
   });
 
   it('renders a URL with a path', () => {
     const { getByText } = render(
       <ConfirmInfoRowUrl url="https://www.example.com/foo" />,
     );
-    expect(getByText('https://www.example.com/foo')).toBeInTheDocument();
+    expect(getByText('www.example.com/foo')).toBeInTheDocument();
   });
 
-  it('renders a URL, protocol, and warning icon when the protocol is "http"', () => {
+  it('renders a URL, and warning icon when the protocol is "http"', () => {
     const { container, getByText } = render(
       <ConfirmInfoRowUrl url="http://www.example.com/" />,
     );
-    expect(getByText('http://www.example.com/')).toBeInTheDocument();
+    expect(getByText('www.example.com/')).toBeInTheDocument();
     expect(getByText('HTTP')).toBeInTheDocument();
     expect(container.querySelector('.mm-icon')).toBeInTheDocument();
     expect(container).toMatchSnapshot();
diff --git a/ui/components/app/confirm/info/row/url.tsx b/ui/components/app/confirm/info/row/url.tsx
index a5a4b715e7c2..c7b9b8d9730a 100644
--- a/ui/components/app/confirm/info/row/url.tsx
+++ b/ui/components/app/confirm/info/row/url.tsx
@@ -32,6 +32,8 @@ export const ConfirmInfoRowUrl = ({ url }: ConfirmInfoRowUrlProps) => {
 
   const isHTTP = urlObject?.protocol === 'http:';
 
+  const urlWithoutProtocol = url?.replace(/https?:\/\//u, '');
+
   return (
     <Box
       display={Display.Flex}
@@ -59,7 +61,7 @@ export const ConfirmInfoRowUrl = ({ url }: ConfirmInfoRowUrlProps) => {
           HTTP
         </Text>
       )}
-      <Text color={TextColor.inherit}>{url}</Text>
+      <Text color={TextColor.inherit}>{urlWithoutProtocol}</Text>
     </Box>
   );
 };
diff --git a/ui/components/app/confirmations/alerts/alert-modal/alert-modal.stories.tsx b/ui/components/app/confirmations/alerts/alert-modal/alert-modal.stories.tsx
new file mode 100644
index 000000000000..180c1e7e2b5e
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/alert-modal/alert-modal.stories.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { AlertModal } from './alert-modal';
+import { Severity } from '../../../../../helpers/constants/design-system';
+import { Meta } from '@storybook/react';
+import configureStore from '../../../../../store/store';
+import { Provider } from 'react-redux';
+import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
+
+const alertsMock: Alert[] = [
+  { key: 'from', severity: Severity.Danger, message: 'Description of what may happen if this alert was ignored', reason: 'Reason for the alert 1', alertDetails: ['We found the contract Petname 0xEqT3b9773b1763efa556f55ccbeb20441962d82x to be malicious',
+  'Operator is an externally owned account (EOA) ',
+  'Operator is untrusted according to previous activity',]},
+  { key: 'data', severity: Severity.Warning, message: 'Alert 2', alertDetails:['detail 1 warning', 'detail 2 warning'] },
+  { key: 'contract', severity: Severity.Info, message: 'Alert Info', alertDetails:['detail 1 info', 'detail  info'] },
+];
+const ownerIdMock = '123';
+const storeMock = configureStore({ confirmAlerts: {
+  alerts: {[ownerIdMock]: alertsMock},
+  confirmed: {[ownerIdMock]: {'from': false, 'data': false, 'contract': false}},
+  } });
+
+export default {
+  title: 'Confirmations/Components/Alerts/AlertModal',
+  component: AlertModal,
+  argTypes: {
+    ownerId: {
+      control: 'text',
+      description: 'The unique identifier of the entity that owns the alert.',
+    },
+    onAcknowledgeClick: {
+      action: 'onClick',
+      description: 'The handler for the alert modal.',
+    },
+    onClose: {
+      action: 'onClick',
+      description: 'The function to be executed when the modal needs to be closed.',
+    },
+    alertKey: {
+      control: 'text',
+      description: 'The unique key representing the specific alert field .',
+    },
+  },
+  args: {
+    onAcknowledgeClick: () => {},
+    ownerId: ownerIdMock,
+  },
+  decorators: [(story) => <Provider store={storeMock}>{story()}</Provider>],
+} as Meta<typeof AlertModal>;
+
+export const DefaultStory = (args) => {
+  return <AlertModal alertKey={'from'} {...args} />;
+};
+
+DefaultStory.storyName = 'Critical Alert';
diff --git a/ui/components/app/confirmations/alerts/alert-modal/alert-modal.test.tsx b/ui/components/app/confirmations/alerts/alert-modal/alert-modal.test.tsx
new file mode 100644
index 000000000000..962beab253d6
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/alert-modal/alert-modal.test.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react';
+import configureMockStore from 'redux-mock-store';
+import { Severity } from '../../../../../helpers/constants/design-system';
+import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
+import { AlertModal } from './alert-modal';
+
+describe('AlertModal', () => {
+  const OWNER_ID_MOCK = '123';
+  const FROM_ALERT_KEY_MOCK = 'from';
+  const ALERT_MESSAGE_MOCK = 'Alert 1';
+  const onAcknowledgeClickMock = jest.fn();
+  const onCloseMock = jest.fn();
+  const alertsMock = [
+    {
+      key: FROM_ALERT_KEY_MOCK,
+      severity: Severity.Warning,
+      message: ALERT_MESSAGE_MOCK,
+      reason: 'Reason 1',
+      alertDetails: ['Detail 1', 'Detail 2'],
+    },
+    { key: 'data', severity: Severity.Danger, message: 'Alert 2' },
+  ];
+
+  const STATE_MOCK = {
+    confirmAlerts: {
+      alerts: { [OWNER_ID_MOCK]: alertsMock },
+      confirmed: {
+        [OWNER_ID_MOCK]: { [FROM_ALERT_KEY_MOCK]: false, data: false },
+      },
+    },
+  };
+  const mockStore = configureMockStore([])(STATE_MOCK);
+
+  it('renders the alert modal', () => {
+    const { getByText } = renderWithProvider(
+      <AlertModal
+        ownerId={OWNER_ID_MOCK}
+        onAcknowledgeClick={onAcknowledgeClickMock}
+        onClose={onCloseMock}
+        alertKey={FROM_ALERT_KEY_MOCK}
+      />,
+      mockStore,
+    );
+
+    expect(getByText(ALERT_MESSAGE_MOCK)).toBeInTheDocument();
+  });
+
+  it('disables button when alert is not acknowledged', () => {
+    const { getByTestId } = renderWithProvider(
+      <AlertModal
+        ownerId={OWNER_ID_MOCK}
+        onAcknowledgeClick={onAcknowledgeClickMock}
+        onClose={onCloseMock}
+        alertKey={'data'}
+      />,
+      mockStore,
+    );
+
+    expect(getByTestId('alert-modal-button')).toBeDisabled();
+  });
+
+  it('calls onAcknowledgeClick when the button is clicked', () => {
+    const mockStoreAcknowledgeAlerts = configureMockStore([])({
+      ...STATE_MOCK,
+      confirmAlerts: {
+        alerts: { [OWNER_ID_MOCK]: alertsMock },
+        confirmed: { [OWNER_ID_MOCK]: { from: true, data: true } },
+      },
+    });
+    const { getByTestId } = renderWithProvider(
+      <AlertModal
+        ownerId={OWNER_ID_MOCK}
+        onAcknowledgeClick={onAcknowledgeClickMock}
+        onClose={onCloseMock}
+        alertKey={FROM_ALERT_KEY_MOCK}
+      />,
+      mockStoreAcknowledgeAlerts,
+    );
+
+    fireEvent.click(getByTestId('alert-modal-button'));
+    expect(onAcknowledgeClickMock).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/ui/components/app/confirmations/alerts/alert-modal/alert-modal.tsx b/ui/components/app/confirmations/alerts/alert-modal/alert-modal.tsx
new file mode 100644
index 000000000000..086eb7e3411b
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/alert-modal/alert-modal.tsx
@@ -0,0 +1,246 @@
+import React, { useCallback } from 'react';
+import { ButtonVariant } from '@metamask/snaps-sdk';
+import {
+  Box,
+  Button,
+  ButtonSize,
+  Checkbox,
+  Icon,
+  IconName,
+  IconSize,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+  Text,
+} from '../../../../component-library';
+import {
+  AlignItems,
+  BackgroundColor,
+  BlockSize,
+  BorderRadius,
+  Display,
+  IconColor,
+  Severity,
+  TextAlign,
+  TextColor,
+  TextVariant,
+} from '../../../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import useAlerts from '../../../../../hooks/useAlerts';
+import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
+
+export type AlertModalProps = {
+  /** The unique key representing the specific alert field. */
+  alertKey: string;
+  /**
+   * The start (left) content area of ModalHeader.
+   * It override `startAccessory` of ModalHeaderDefault and by default no content is present.
+   */
+  headerStartAccessory?: React.ReactNode;
+  /** The owner ID of the relevant alert from the `confirmAlerts` reducer. */
+  ownerId: string;
+  /** The function invoked when the user acknowledges the alert. */
+  onAcknowledgeClick: () => void;
+  /** The function to be executed when the modal needs to be closed. */
+  onClose: () => void;
+};
+
+function getSeverityStyle(severity: Severity) {
+  switch (severity) {
+    case Severity.Warning:
+      return {
+        background: BackgroundColor.warningMuted,
+        icon: IconColor.warningDefault,
+      };
+    case Severity.Danger:
+      return {
+        background: BackgroundColor.errorMuted,
+        icon: IconColor.errorDefault,
+      };
+    default:
+      return {
+        background: BackgroundColor.infoMuted,
+        icon: IconColor.infoDefault,
+      };
+  }
+}
+
+function AlertHeader({ selectedAlert }: { selectedAlert: Alert }) {
+  const t = useI18nContext();
+  const severityStyle = getSeverityStyle(selectedAlert.severity);
+  return (
+    <>
+      <Box
+        gap={3}
+        display={Display.Block}
+        alignItems={AlignItems.center}
+        textAlign={TextAlign.Center}
+        marginTop={3}
+      >
+        <Icon
+          name={
+            selectedAlert.severity === Severity.Info
+              ? IconName.Info
+              : IconName.Danger
+          }
+          size={IconSize.Xl}
+          color={severityStyle.icon}
+        />
+        <Text
+          variant={TextVariant.headingSm}
+          color={TextColor.inherit}
+          marginTop={3}
+          marginBottom={4}
+        >
+          {selectedAlert.reason ?? t('alert')}
+        </Text>
+      </Box>
+    </>
+  );
+}
+
+function AlertDetails({ selectedAlert }: { selectedAlert: Alert }) {
+  const t = useI18nContext();
+  const severityStyle = getSeverityStyle(selectedAlert.severity);
+  return (
+    <Box
+      key={selectedAlert.key}
+      display={Display.InlineBlock}
+      padding={2}
+      width={BlockSize.Full}
+      backgroundColor={severityStyle.background}
+      gap={2}
+      borderRadius={BorderRadius.SM}
+    >
+      <Text variant={TextVariant.bodySm}>{selectedAlert.message}</Text>
+      {selectedAlert.alertDetails?.length ? (
+        <Text variant={TextVariant.bodySmBold} marginTop={1}>
+          {t('alertModalDetails')}
+        </Text>
+      ) : null}
+
+      <Box as="ul" className={'alert-modal__alert-details'} paddingLeft={6}>
+        {selectedAlert.alertDetails?.map((detail, index) => (
+          <Box as="li" key={`${selectedAlert.key}-detail-${index}`}>
+            <Text variant={TextVariant.bodySm}>{detail}</Text>
+          </Box>
+        ))}
+      </Box>
+    </Box>
+  );
+}
+
+function AcknowledgeCheckbox({
+  selectedAlert,
+  setAlertConfirmed,
+  isConfirmed,
+}: {
+  selectedAlert: Alert;
+  setAlertConfirmed: (alertKey: string, isConfirmed: boolean) => void;
+  isConfirmed: boolean;
+}) {
+  const t = useI18nContext();
+  const severityStyle = getSeverityStyle(selectedAlert.severity);
+  const handleCheckboxClick = () => {
+    return setAlertConfirmed(selectedAlert.key, !isConfirmed);
+  };
+  return (
+    <Box
+      display={Display.Flex}
+      padding={3}
+      width={BlockSize.Full}
+      gap={3}
+      backgroundColor={severityStyle.background}
+      marginTop={4}
+      borderRadius={BorderRadius.LG}
+    >
+      <Checkbox
+        label={t('alertModalAcknowledge')}
+        data-testid="alert-modal-acknowledge-checkbox"
+        isChecked={isConfirmed}
+        onChange={handleCheckboxClick}
+        alignItems={AlignItems.flexStart}
+        className={'alert-modal__acknowledge-checkbox'}
+      />
+    </Box>
+  );
+}
+
+function AcknowledgeButton({
+  onAcknowledgeClick,
+  isConfirmed,
+}: {
+  onAcknowledgeClick: () => void;
+  isConfirmed: boolean;
+}) {
+  const t = useI18nContext();
+
+  return (
+    <>
+      <Button
+        variant={ButtonVariant.Primary}
+        width={BlockSize.Full}
+        onClick={onAcknowledgeClick}
+        size={ButtonSize.Lg}
+        data-testid="alert-modal-button"
+        disabled={!isConfirmed}
+      >
+        {t('gotIt')}
+      </Button>
+    </>
+  );
+}
+
+export function AlertModal({
+  ownerId,
+  onAcknowledgeClick,
+  alertKey,
+  onClose,
+  headerStartAccessory,
+}: AlertModalProps) {
+  const { alerts, isAlertConfirmed, setAlertConfirmed } = useAlerts(ownerId);
+
+  const handleClose = useCallback(() => {
+    onClose();
+  }, [onClose]);
+
+  const selectedAlert = alerts.find((alert) => alert.key === alertKey);
+
+  if (!selectedAlert) {
+    return null;
+  }
+  const isConfirmed = isAlertConfirmed(selectedAlert.key);
+
+  return (
+    <Modal isOpen onClose={handleClose}>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader
+          onClose={handleClose}
+          startAccessory={headerStartAccessory}
+          className={'alert-modal__header'}
+          borderWidth={1}
+          display={headerStartAccessory ? Display.InlineFlex : Display.Block}
+        />
+        <AlertHeader selectedAlert={selectedAlert} />
+        <ModalBody>
+          <AlertDetails selectedAlert={selectedAlert} />
+          <AcknowledgeCheckbox
+            selectedAlert={selectedAlert}
+            isConfirmed={isConfirmed}
+            setAlertConfirmed={setAlertConfirmed}
+          />
+        </ModalBody>
+        <ModalFooter>
+          <AcknowledgeButton
+            onAcknowledgeClick={onAcknowledgeClick}
+            isConfirmed={isConfirmed}
+          />
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/ui/components/app/confirmations/alerts/alert-modal/index.scss b/ui/components/app/confirmations/alerts/alert-modal/index.scss
new file mode 100644
index 000000000000..5518c2e0a6f5
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/alert-modal/index.scss
@@ -0,0 +1,19 @@
+@use "design-system";
+
+.alert-modal {
+  &__header {
+    border-width: 0 0 1px 0;
+    border-color: var(--brand-colors-grey-grey040);
+  }
+
+  &__alert-details {
+    list-style-type: disc;
+    word-wrap: break-word;
+  }
+
+  &__acknowledge-checkbox {
+    @include design-system.H6;
+
+    padding-top: 2px;
+  }
+}
diff --git a/ui/components/app/confirmations/alerts/alert-modal/index.tsx b/ui/components/app/confirmations/alerts/alert-modal/index.tsx
new file mode 100644
index 000000000000..fc543448302d
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/alert-modal/index.tsx
@@ -0,0 +1 @@
+export { AlertModal } from './alert-modal';
diff --git a/ui/pages/confirmations/components/alerts/inline-alert/__snapshots__/inline-alert.test.tsx.snap b/ui/components/app/confirmations/alerts/inline-alert/__snapshots__/inline-alert.test.tsx.snap
similarity index 96%
rename from ui/pages/confirmations/components/alerts/inline-alert/__snapshots__/inline-alert.test.tsx.snap
rename to ui/components/app/confirmations/alerts/inline-alert/__snapshots__/inline-alert.test.tsx.snap
index eaae7f4cd5ab..ef56b906038f 100644
--- a/ui/pages/confirmations/components/alerts/inline-alert/__snapshots__/inline-alert.test.tsx.snap
+++ b/ui/components/app/confirmations/alerts/inline-alert/__snapshots__/inline-alert.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`Inline Alert renders alert with danger severity 1`] = `
   >
     <div
       class="mm-box inline-alert inline-alert__danger mm-box--display-inline-flex mm-box--gap-1 mm-box--align-items-center mm-box--background-color-error-muted mm-box--rounded-sm"
-      data-testid="inlineAlert"
+      data-testid="inline-alert"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -34,7 +34,7 @@ exports[`Inline Alert renders alert with informative severity 1`] = `
   >
     <div
       class="mm-box inline-alert inline-alert__info mm-box--display-inline-flex mm-box--gap-1 mm-box--align-items-center mm-box--background-color-primary-muted mm-box--rounded-sm"
-      data-testid="inlineAlert"
+      data-testid="inline-alert"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -61,7 +61,7 @@ exports[`Inline Alert renders alert with warning severity 1`] = `
   >
     <div
       class="mm-box inline-alert inline-alert__warning mm-box--display-inline-flex mm-box--gap-1 mm-box--align-items-center mm-box--background-color-warning-muted mm-box--rounded-sm"
-      data-testid="inlineAlert"
+      data-testid="inline-alert"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/alerts/inline-alert/index.scss b/ui/components/app/confirmations/alerts/inline-alert/index.scss
similarity index 91%
rename from ui/pages/confirmations/components/alerts/inline-alert/index.scss
rename to ui/components/app/confirmations/alerts/inline-alert/index.scss
index bd64795ed58c..9ba2b52a5533 100644
--- a/ui/pages/confirmations/components/alerts/inline-alert/index.scss
+++ b/ui/components/app/confirmations/alerts/inline-alert/index.scss
@@ -1,5 +1,6 @@
 .inline-alert {
   padding: 2px;
+  cursor: pointer;
 
   &__danger {
     color: var(--color-error-default);
diff --git a/ui/pages/confirmations/components/alerts/inline-alert/index.ts b/ui/components/app/confirmations/alerts/inline-alert/index.ts
similarity index 100%
rename from ui/pages/confirmations/components/alerts/inline-alert/index.ts
rename to ui/components/app/confirmations/alerts/inline-alert/index.ts
diff --git a/ui/pages/confirmations/components/alerts/inline-alert/inline-alert.stories.tsx b/ui/components/app/confirmations/alerts/inline-alert/inline-alert.stories.tsx
similarity index 100%
rename from ui/pages/confirmations/components/alerts/inline-alert/inline-alert.stories.tsx
rename to ui/components/app/confirmations/alerts/inline-alert/inline-alert.stories.tsx
diff --git a/ui/pages/confirmations/components/alerts/inline-alert/inline-alert.test.tsx b/ui/components/app/confirmations/alerts/inline-alert/inline-alert.test.tsx
similarity index 100%
rename from ui/pages/confirmations/components/alerts/inline-alert/inline-alert.test.tsx
rename to ui/components/app/confirmations/alerts/inline-alert/inline-alert.test.tsx
diff --git a/ui/pages/confirmations/components/alerts/inline-alert/inline-alert.tsx b/ui/components/app/confirmations/alerts/inline-alert/inline-alert.tsx
similarity index 90%
rename from ui/pages/confirmations/components/alerts/inline-alert/inline-alert.tsx
rename to ui/components/app/confirmations/alerts/inline-alert/inline-alert.tsx
index 427566b07e41..28b41a0f7060 100644
--- a/ui/pages/confirmations/components/alerts/inline-alert/inline-alert.tsx
+++ b/ui/components/app/confirmations/alerts/inline-alert/inline-alert.tsx
@@ -6,7 +6,7 @@ import {
   IconName,
   IconSize,
   Text,
-} from '../../../../../components/component-library';
+} from '../../../../component-library';
 import {
   AlignItems,
   BackgroundColor,
@@ -23,6 +23,8 @@ export type InlineAlertProps = {
   onClick?: () => void;
   /** The severity of the alert, e.g. Severity.Warning */
   severity?: Severity;
+  /** Additional styles to apply to the inline alert */
+  style?: React.CSSProperties;
 };
 
 function getSeverityBackground(severity: Severity): BackgroundColor {
@@ -40,13 +42,14 @@ function getSeverityBackground(severity: Severity): BackgroundColor {
 export default function InlineAlert({
   onClick,
   severity = Severity.Info,
+  style,
 }: InlineAlertProps) {
   const t = useI18nContext();
 
   return (
     <Box>
       <Box
-        data-testid="inlineAlert"
+        data-testid="inline-alert"
         backgroundColor={getSeverityBackground(severity)}
         borderRadius={BorderRadius.SM}
         gap={1}
@@ -58,6 +61,7 @@ export default function InlineAlert({
           'inline-alert__warning': severity === Severity.Warning,
           'inline-alert__danger': severity === Severity.Danger,
         })}
+        style={style}
         onClick={onClick}
       >
         <Icon
diff --git a/ui/components/app/confirmations/alerts/multiple-alert-modal/index.tsx b/ui/components/app/confirmations/alerts/multiple-alert-modal/index.tsx
new file mode 100644
index 000000000000..116d7d4f4cbf
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/multiple-alert-modal/index.tsx
@@ -0,0 +1 @@
+export { MultipleAlertModal } from './multiple-alert-modal';
diff --git a/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.stories.tsx b/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.stories.tsx
new file mode 100644
index 000000000000..c8dd56b98d91
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.stories.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+import { MultipleAlertModal } from './multiple-alert-modal';
+import { Severity } from '../../../../../helpers/constants/design-system';
+import { Meta } from '@storybook/react';
+import configureStore from '../../../../../store/store';
+import { Provider } from 'react-redux';
+import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
+
+const ALERTS_MOCK: Alert[] = [
+  { key: 'from', severity: Severity.Danger, message: 'Description of what may happen if this alert was ignored', reason: 'Reason for the alert 1', alertDetails: ['We found the contract Petname 0xEqT3b9773b1763efa556f55ccbeb20441962d82x to be malicious',
+  'Operator is an externally owned account (EOA) ',
+  'Operator is untrusted according to previous activity',]},
+  { key: 'data', severity: Severity.Warning, message: 'Alert 2', alertDetails:['detail 1 warning', 'detail 2 warning'] },
+  { key: 'contract', severity: Severity.Info, message: 'Alert Info', alertDetails:['detail 1 info', 'detail  info'] },
+];
+const OWNER_ID_MOCK = '123';
+const storeMock = configureStore({ confirmAlerts: {
+  alerts: {[OWNER_ID_MOCK]: ALERTS_MOCK},
+  confirmed: {[OWNER_ID_MOCK]: {'from': false, 'data': false, 'contract': false}},
+  } });
+
+export default {
+  title: 'Confirmations/Components/Alerts/MultipleAlertModal',
+  component: MultipleAlertModal,
+  argTypes: {
+    alertKey: {
+      control: 'text',
+      description: 'The unique key representing the specific alert field .',
+    },
+    onAcknowledgeClick: {
+      action: 'onClick',
+      description: 'The handler for the alert modal.',
+    },
+    onClose: {
+      action: 'onClick',
+      description: 'The function to be executed when the modal needs to be closed.',
+    },
+    ownerId: {
+      control: 'text',
+      description: 'The unique identifier of the entity that owns the alert.',
+    },
+  },
+  args: {
+    onAcknowledgeClick: () => {},
+    onClose: () => {},
+    ownerId: OWNER_ID_MOCK,
+  },
+  decorators: [(story) => <Provider store={storeMock}>{story()}</Provider>],
+} as Meta<typeof MultipleAlertModal>;
+
+export const TemplateStory = (args) => {
+  return <MultipleAlertModal alertKey={'from'} {...args} />;
+};
+TemplateStory.storyName = 'Multiple Critical Alert Modal';
+
+/**
+ * Single Critical Alert Modal.
+ */
+export const SingleCriticalAlertModal = TemplateStory.bind({});
+SingleCriticalAlertModal.storyName = 'Single Critical Alert Modal';
+SingleCriticalAlertModal.args = {
+  alertKey: 'from',
+};
+SingleCriticalAlertModal.decorators = [
+  (story) => {
+    const singleAlertStore = configureStore({
+      confirmAlerts: {
+        alerts: { [OWNER_ID_MOCK]: [ALERTS_MOCK[0]] },
+        confirmed: { [OWNER_ID_MOCK]: { 'from': false } },
+      }
+    });
+    return <Provider store={singleAlertStore}>{story()}</Provider>
+  }
+];
+
+/**
+ * Multiple Warning Alert Modal.
+ */
+export const MultipleWarningAlertModal = TemplateStory.bind({});
+
+MultipleWarningAlertModal.storyName = 'Multiple Warning Alert Modal';
+MultipleWarningAlertModal.args = {
+  alertKey: 'data',
+};
+
+/**
+ * Multiple Info Alert Modal.
+ */
+export const MultipleInfoAlertModal = TemplateStory.bind({});
+MultipleInfoAlertModal.storyName = 'Multiple Info Alert Modal';
+MultipleInfoAlertModal.args = {
+  alertKey: 'contract',
+};
+
+/**
+ * Multiple Critical Alert Modal.
+ */
+export const MultipleCriticalAlertModal = TemplateStory.bind({});
+MultipleCriticalAlertModal.storyName = 'Multiple Critical Alert Modal';
+MultipleCriticalAlertModal.args = {
+  alertKey: 'from',
+};
\ No newline at end of file
diff --git a/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.test.tsx b/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.test.tsx
new file mode 100644
index 000000000000..4a40095152e8
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.test.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent } from '@testing-library/react';
+import { Severity } from '../../../../../helpers/constants/design-system';
+import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
+import {
+  MultipleAlertModal,
+  MultipleAlertModalProps,
+} from './multiple-alert-modal';
+
+describe('MultipleAlertModal', () => {
+  const OWNER_ID_MOCK = '123';
+  const FROM_ALERT_KEY_MOCK = 'from';
+  const onAcknowledgeClickMock = jest.fn();
+  const onCloseMock = jest.fn();
+  const alertsMock = [
+    {
+      key: FROM_ALERT_KEY_MOCK,
+      severity: Severity.Warning,
+      message: 'Alert 1',
+      reason: 'Reason 1',
+      alertDetails: ['Detail 1', 'Detail 2'],
+    },
+    { key: 'data', severity: Severity.Danger, message: 'Alert 2' },
+  ];
+
+  const STATE_MOCK = {
+    confirmAlerts: {
+      alerts: { [OWNER_ID_MOCK]: alertsMock },
+      confirmed: {
+        [OWNER_ID_MOCK]: { [FROM_ALERT_KEY_MOCK]: false, data: false },
+      },
+    },
+  };
+  const mockStore = configureMockStore([])(STATE_MOCK);
+
+  const defaultProps: MultipleAlertModalProps = {
+    ownerId: OWNER_ID_MOCK,
+    onFinalAcknowledgeClick: onAcknowledgeClickMock,
+    alertKey: FROM_ALERT_KEY_MOCK,
+    onClose: onCloseMock,
+  };
+
+  it('renders the multiple alert modal', () => {
+    const { getByTestId } = renderWithProvider(
+      <MultipleAlertModal {...defaultProps} />,
+      mockStore,
+    );
+
+    expect(getByTestId('alert-modal-next-button')).toBeDefined();
+  });
+
+  it('invokes the onFinalAcknowledgeClick when the button is clicked', () => {
+    const mockStoreAcknowledgeAlerts = configureMockStore([])({
+      ...STATE_MOCK,
+      confirmAlerts: {
+        alerts: { [OWNER_ID_MOCK]: alertsMock },
+        confirmed: { [OWNER_ID_MOCK]: { from: false, data: true } },
+      },
+    });
+    const { getByTestId } = renderWithProvider(
+      <MultipleAlertModal {...defaultProps} alertKey={'data'} />,
+      mockStoreAcknowledgeAlerts,
+    );
+
+    fireEvent.click(getByTestId('alert-modal-button'));
+
+    expect(onAcknowledgeClickMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('render the next alert when the "Got it" button is clicked', () => {
+    const { getByTestId, getByText } = renderWithProvider(
+      <MultipleAlertModal {...defaultProps} />,
+      mockStore,
+    );
+
+    fireEvent.click(getByTestId('alert-modal-button'));
+
+    expect(getByText(alertsMock[0].message)).toBeInTheDocument();
+  });
+
+  describe('Navigation', () => {
+    it('calls next alert when the next button is clicked', () => {
+      const { getByTestId, getByText } = renderWithProvider(
+        <MultipleAlertModal {...defaultProps} />,
+        mockStore,
+      );
+
+      fireEvent.click(getByTestId('alert-modal-next-button'));
+
+      expect(getByText(alertsMock[1].message)).toBeInTheDocument();
+    });
+
+    it('calls previous alert when the previous button is clicked', () => {
+      const selectSecondAlertMock = { ...defaultProps, alertKey: 'data' };
+      const { getByTestId, getByText } = renderWithProvider(
+        <MultipleAlertModal {...selectSecondAlertMock} />,
+        mockStore,
+      );
+
+      fireEvent.click(getByTestId('alert-modal-back-button'));
+
+      expect(getByText(alertsMock[0].message)).toBeInTheDocument();
+    });
+  });
+});
diff --git a/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.tsx b/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.tsx
new file mode 100644
index 000000000000..86321779e947
--- /dev/null
+++ b/ui/components/app/confirmations/alerts/multiple-alert-modal/multiple-alert-modal.tsx
@@ -0,0 +1,190 @@
+import React, { useCallback, useState } from 'react';
+import {
+  Box,
+  ButtonIcon,
+  ButtonIconSize,
+  IconName,
+  Text,
+} from '../../../../component-library';
+import {
+  AlignItems,
+  BackgroundColor,
+  BorderRadius,
+  Display,
+  IconColor,
+  TextColor,
+  TextVariant,
+} from '../../../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import useAlerts from '../../../../../hooks/useAlerts';
+import { AlertModal } from '../alert-modal';
+import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
+
+export type MultipleAlertModalProps = {
+  /** The key of the initial alert to display. */
+  alertKey: string;
+  /** The function to be executed when the modal needs to be closed. */
+  onClose: () => void;
+  /** The function to be executed when the button in the alert modal is clicked. */
+  onFinalAcknowledgeClick: () => void;
+  /** The unique identifier of the entity that owns the alert. */
+  ownerId: string;
+};
+
+function PreviousButton({
+  selectedIndex,
+  onBackButtonClick,
+}: {
+  selectedIndex: number;
+  onBackButtonClick: () => void;
+}) {
+  const t = useI18nContext();
+  const showPreviousButton = selectedIndex + 1 > 1;
+  if (!showPreviousButton) {
+    return null;
+  }
+
+  return (
+    <ButtonIcon
+      iconName={IconName.ArrowLeft}
+      ariaLabel={t('back')}
+      size={ButtonIconSize.Sm}
+      onClick={onBackButtonClick}
+      className={'confirm_nav__left_btn'}
+      data-testid="alert-modal-back-button"
+      borderRadius={BorderRadius.full}
+      color={IconColor.iconAlternative}
+      backgroundColor={BackgroundColor.backgroundAlternative}
+    />
+  );
+}
+
+function NextButton({
+  selectedIndex,
+  alertsLength,
+  onNextButtonClick,
+}: {
+  selectedIndex: number;
+  alertsLength: number;
+  onNextButtonClick: () => void;
+}) {
+  const t = useI18nContext();
+  const showNextButton = selectedIndex + 1 < alertsLength;
+  if (!showNextButton) {
+    return null;
+  }
+
+  return (
+    <ButtonIcon
+      iconName={IconName.ArrowRight}
+      ariaLabel={t('next')}
+      size={ButtonIconSize.Sm}
+      onClick={onNextButtonClick}
+      className={'confirm_nav__right_btn'}
+      data-testid="alert-modal-next-button"
+      borderRadius={BorderRadius.full}
+      color={IconColor.iconAlternative}
+      backgroundColor={BackgroundColor.backgroundAlternative}
+    />
+  );
+}
+
+function PageNumber({
+  selectedIndex,
+  alertsLength,
+}: {
+  selectedIndex: number;
+  alertsLength: number;
+}) {
+  const t = useI18nContext();
+  return (
+    <Text
+      variant={TextVariant.bodySm}
+      color={TextColor.textAlternative}
+      marginInline={2}
+    >
+      {`${selectedIndex + 1} ${t('ofTextNofM')} ${alertsLength}`}
+    </Text>
+  );
+}
+
+function PageNavigation({
+  alerts,
+  onBackButtonClick,
+  onNextButtonClick,
+  selectedIndex,
+}: {
+  alerts: Alert[];
+  onBackButtonClick: () => void;
+  onNextButtonClick: () => void;
+  selectedIndex: number;
+}) {
+  if (alerts.length <= 1) {
+    return null;
+  }
+  return (
+    <Box display={Display.Flex} alignItems={AlignItems.center}>
+      <PreviousButton
+        selectedIndex={selectedIndex}
+        onBackButtonClick={onBackButtonClick}
+      />
+      <PageNumber selectedIndex={selectedIndex} alertsLength={alerts.length} />
+      <NextButton
+        selectedIndex={selectedIndex}
+        alertsLength={alerts.length}
+        onNextButtonClick={onNextButtonClick}
+      />
+    </Box>
+  );
+}
+
+export function MultipleAlertModal({
+  alertKey,
+  onClose,
+  onFinalAcknowledgeClick,
+  ownerId,
+}: MultipleAlertModalProps) {
+  const { alerts } = useAlerts(ownerId);
+
+  const [selectedIndex, setSelectedIndex] = useState(
+    alerts.findIndex((alert) => alert.key === alertKey),
+  );
+
+  const selectedAlert = alerts[selectedIndex];
+
+  const handleBackButtonClick = useCallback(() => {
+    setSelectedIndex((prevIndex) =>
+      prevIndex > 0 ? prevIndex - 1 : prevIndex,
+    );
+  }, []);
+
+  const handleNextButtonClick = useCallback(() => {
+    setSelectedIndex((prevIndex) => prevIndex + 1);
+  }, []);
+
+  const handleAcknowledgeClick = useCallback(() => {
+    if (selectedIndex + 1 === alerts.length) {
+      onFinalAcknowledgeClick();
+      return;
+    }
+
+    handleBackButtonClick();
+  }, [onFinalAcknowledgeClick, handleBackButtonClick, selectedIndex, alerts]);
+
+  return (
+    <AlertModal
+      ownerId={ownerId}
+      onAcknowledgeClick={handleAcknowledgeClick}
+      alertKey={selectedAlert.key}
+      onClose={onClose}
+      headerStartAccessory={
+        <PageNavigation
+          alerts={alerts}
+          onBackButtonClick={handleBackButtonClick}
+          onNextButtonClick={handleNextButtonClick}
+          selectedIndex={selectedIndex}
+        />
+      }
+    />
+  );
+}
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 2a0b927542d6..6cbcb5c8787d 100644
--- a/ui/components/app/connected-status-indicator/connected-status-indicator.js
+++ b/ui/components/app/connected-status-indicator/connected-status-indicator.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
-import { findKey } from 'lodash';
 import { WALLET_SNAP_PERMISSION_KEY } from '@metamask/snaps-utils';
 import {
   STATUS_CONNECTED,
@@ -15,10 +14,9 @@ import {
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
-  getAddressConnectedSubjectMap,
-  getOriginOfCurrentTab,
   getPermissionsForActiveTab,
   getSelectedInternalAccount,
+  getPermittedAccountsForCurrentTab,
 } from '../../../selectors';
 import { ConnectedSiteMenu } from '../../multichain';
 
@@ -33,17 +31,15 @@ export default function ConnectedStatusIndicator({ onClick }) {
     .map((permission) => permission.key)
     .includes(WALLET_SNAP_PERMISSION_KEY);
 
-  const addressConnectedSubjectMap = useSelector(getAddressConnectedSubjectMap);
-  const originOfCurrentTab = useSelector(getOriginOfCurrentTab);
-
-  const selectedAddressSubjectMap = addressConnectedSubjectMap[selectedAddress];
-  const currentTabIsConnectedToSelectedAddress = Boolean(
-    selectedAddressSubjectMap && selectedAddressSubjectMap[originOfCurrentTab],
+  const permittedAccounts = useSelector(getPermittedAccountsForCurrentTab);
+  const currentTabIsConnectedToSelectedAddress = permittedAccounts.find(
+    (account) => account === selectedAddress,
   );
+
   let status;
   if (currentTabIsConnectedToSelectedAddress) {
     status = STATUS_CONNECTED;
-  } else if (findKey(addressConnectedSubjectMap, originOfCurrentTab)) {
+  } else if (permittedAccounts.length > 0) {
     status = STATUS_CONNECTED_TO_ANOTHER_ACCOUNT;
   } else if (activeWalletSnap) {
     status = STATUS_CONNECTED_TO_SNAP;
diff --git a/ui/components/app/currency-input/currency-input.js b/ui/components/app/currency-input/currency-input.js
index d22ceb289847..f19dfd91d9fa 100644
--- a/ui/components/app/currency-input/currency-input.js
+++ b/ui/components/app/currency-input/currency-input.js
@@ -68,11 +68,12 @@ export default function CurrencyInput({
   const [fiatDecimalValue, setFiatDecimalValue] = useState('0');
 
   const chainId = useSelector(getCurrentChainId);
-  const { ticker, type } = useSelector(getProviderConfig);
+  const { ticker, type, rpcUrl } = useSelector(getProviderConfig);
   const isOriginalNativeSymbol = useIsOriginalNativeTokenSymbol(
     chainId,
     ticker,
     type,
+    rpcUrl,
   );
 
   const tokenToFiatConversionRate = useTokenExchangeRate(asset?.address);
diff --git a/ui/components/app/currency-input/hooks/useTokenExchangeRate.test.tsx b/ui/components/app/currency-input/hooks/useTokenExchangeRate.test.tsx
index f6c933797eae..22c0ddbd3011 100644
--- a/ui/components/app/currency-input/hooks/useTokenExchangeRate.test.tsx
+++ b/ui/components/app/currency-input/hooks/useTokenExchangeRate.test.tsx
@@ -25,6 +25,8 @@ const renderUseTokenExchangeRate = (tokenAddress?: string) => {
     },
   };
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const wrapper = ({ children }: any) => (
     <Provider store={configureStore(state)}>{children}</Provider>
   );
diff --git a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
index 113576393df9..0f6521e00795 100644
--- a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
+++ b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
@@ -63,7 +63,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -76,7 +76,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
               />
             </div>
             <input
@@ -150,7 +150,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -163,7 +163,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -233,7 +233,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -246,7 +246,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
               />
             </div>
             <input
@@ -316,7 +316,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -329,7 +329,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -399,7 +399,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -412,7 +412,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
               />
             </div>
             <input
@@ -486,7 +486,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -499,7 +499,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
               />
             </div>
             <input
@@ -573,7 +573,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -586,7 +586,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
               />
             </div>
             <input
diff --git a/ui/components/app/incoming-trasaction-toggle/incoming-transaction-toggle.tsx b/ui/components/app/incoming-trasaction-toggle/incoming-transaction-toggle.tsx
index c00defb09fae..3b44a56b262f 100644
--- a/ui/components/app/incoming-trasaction-toggle/incoming-transaction-toggle.tsx
+++ b/ui/components/app/incoming-trasaction-toggle/incoming-transaction-toggle.tsx
@@ -14,8 +14,12 @@ import { TEST_CHAINS } from '../../../../shared/constants/network';
 import NetworkToggle from './network-toggle';
 
 type IncomingTransactionToggleProps = {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   wrapperRef?: PolymorphicRef<any>;
   incomingTransactionsPreferences: Record<string, boolean>;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   allNetworks: Record<string, any>[];
   setIncomingTransactionsPreferences: (
     chainId: string,
@@ -82,8 +86,14 @@ IncomingTransactionToggle.propTypes = {
 
 function generateIncomingNetworkPreferences(
   incomingTransactionsPreferences: Record<string, boolean>,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   allNetworks: Record<string, any>,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): Record<string, any> {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const incomingTxnPreferences: Record<string, any> = {};
 
   Object.keys(allNetworks).forEach((id) => {
diff --git a/ui/components/app/metamask-template-renderer/safe-component-list.js b/ui/components/app/metamask-template-renderer/safe-component-list.js
index f61dc60c871a..2705c7405d36 100644
--- a/ui/components/app/metamask-template-renderer/safe-component-list.js
+++ b/ui/components/app/metamask-template-renderer/safe-component-list.js
@@ -21,6 +21,7 @@ import { SnapDelineator } from '../snaps/snap-delineator';
 import { Copyable } from '../snaps/copyable';
 import Spinner from '../../ui/spinner';
 import { SnapUIMarkdown } from '../snaps/snap-ui-markdown';
+import { SmartTransactionStatusPage } from '../../../pages/smart-transactions/smart-transaction-status-page';
 import { SnapUIImage } from '../snaps/snap-ui-image';
 import { SnapUIInput } from '../snaps/snap-ui-input';
 import { SnapUIForm } from '../snaps/snap-ui-form';
@@ -62,6 +63,7 @@ export const safeComponentList = {
   Tooltip,
   TruncatedDefinitionList,
   Typography,
+  SmartTransactionStatusPage,
   UrlIcon,
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   Copyable,
diff --git a/ui/components/app/mmi-signature-mismatch-banner/mmi-signature-mismatch-banner.tsx b/ui/components/app/mmi-signature-mismatch-banner/mmi-signature-mismatch-banner.tsx
index 2fd2469a5518..3fd8d7449d53 100644
--- a/ui/components/app/mmi-signature-mismatch-banner/mmi-signature-mismatch-banner.tsx
+++ b/ui/components/app/mmi-signature-mismatch-banner/mmi-signature-mismatch-banner.tsx
@@ -21,10 +21,13 @@ import {
   getSelectedInternalAccount,
 } from '../../../selectors';
 import { Box, Icon, IconName, Text } from '../../component-library';
+import { SignatureRequestType } from '../../../pages/confirmations/types/confirm';
 
 const MMISignatureMismatchBanner: React.FC = memo(() => {
   const t = useI18nContext();
-  const currentConfirmation = useSelector(currentConfirmationSelector);
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as SignatureRequestType;
   const selectedAccount = useSelector(getSelectedInternalAccount);
   const allAccounts = useSelector(accountsWithSendEtherInfoSelector);
 
@@ -57,7 +60,6 @@ const MMISignatureMismatchBanner: React.FC = memo(() => {
       display={Display.Flex}
       width={BlockSize.Full}
       padding={4}
-      marginBottom={4}
       backgroundColor={BackgroundColor.primaryMuted}
     >
       <Icon
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 bf002ac7de5f..30766907854f 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
@@ -11,7 +11,7 @@ export default class ConfirmRemoveAccount extends Component {
   static propTypes = {
     hideModal: PropTypes.func.isRequired,
     removeAccount: PropTypes.func.isRequired,
-    identity: PropTypes.shape({
+    account: PropTypes.shape({
       id: PropTypes.string.isRequired,
       address: PropTypes.string.isRequired,
       metadata: PropTypes.shape({
@@ -37,7 +37,7 @@ export default class ConfirmRemoveAccount extends Component {
 
   handleRemove = () => {
     this.props
-      .removeAccount(this.props.identity.address)
+      .removeAccount(this.props.account.address)
       .then(() => this.props.hideModal());
   };
 
@@ -47,31 +47,31 @@ export default class ConfirmRemoveAccount extends Component {
 
   renderSelectedAccount() {
     const { t } = this.context;
-    const { identity, rpcPrefs, chainId } = this.props;
+    const { account, rpcPrefs, chainId } = this.props;
     return (
       <div className="confirm-remove-account__account">
         <div className="confirm-remove-account__account__identicon">
-          <Identicon address={identity.address} diameter={32} />
+          <Identicon address={account.address} diameter={32} />
         </div>
         <div className="confirm-remove-account__account__name">
           <span className="confirm-remove-account__account__label">
             {t('name')}
           </span>
-          <span className="account_value">{identity.metadata.name}</span>
+          <span className="account_value">{account.metadata.name}</span>
         </div>
         <div className="confirm-remove-account__account__address">
           <span className="confirm-remove-account__account__label">
             {t('publicAddress')}
           </span>
           <span className="account_value">
-            {addressSummary(identity.address, 4, 4)}
+            {addressSummary(account.address, 4, 4)}
           </span>
         </div>
         <div className="confirm-remove-account__account__link">
           <a
             onClick={() => {
               const accountLink = getAccountLink(
-                identity.address,
+                account.address,
                 chainId,
                 rpcPrefs,
               );
diff --git a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.stories.js b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.stories.js
index 5ec4552e6c6c..3c6ce0ae6497 100644
--- a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.stories.js
+++ b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.stories.js
@@ -7,12 +7,12 @@ export default {
 
   component: ConfirmRemoveAccount,
   argTypes: {
-    identity: {
+    account: {
       control: 'object',
     },
   },
   args: {
-    identity: {
+    account: {
       address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
       id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
       metadata: {
@@ -22,7 +22,14 @@ export default {
         },
       },
       options: {},
-      methods: [...Object.values(EthMethod)],
+      methods: [
+        EthMethod.PersonalSign,
+        EthMethod.Sign,
+        EthMethod.SignTransaction,
+        EthMethod.SignTypedDataV1,
+        EthMethod.SignTypedDataV3,
+        EthMethod.SignTypedDataV4,
+      ],
       type: EthAccountType.Eoa,
     },
   },
diff --git a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.test.js b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.test.js
index f609a317e284..64cf8f4513f5 100644
--- a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.test.js
+++ b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.test.js
@@ -35,7 +35,7 @@ describe('Confirm Remove Account', () => {
   const props = {
     hideModal: jest.fn(),
     removeAccount: jest.fn().mockResolvedValue(),
-    identity: {
+    account: {
       address: '0x0',
       id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
       metadata: {
@@ -83,7 +83,7 @@ describe('Confirm Remove Account', () => {
 
     fireEvent.click(queryByText('Remove'));
 
-    expect(props.removeAccount).toHaveBeenCalledWith(props.identity.address);
+    expect(props.removeAccount).toHaveBeenCalledWith(props.account.address);
     expect(props.hideModal).toHaveBeenCalled();
   });
 
diff --git a/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap b/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap
index dfc4a65fdd05..87de53ae8c56 100644
--- a/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap
+++ b/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap
@@ -66,7 +66,7 @@ exports[`Eth Sign Modal should match snapshot 1`] = `
           class="mm-checkbox__input-wrapper"
         >
           <input
-            class="mm-box mm-checkbox__input mm-box--margin-0 mm-box--margin-right-2 mm-box--display-flex mm-box--background-color-transparent mm-box--rounded-sm mm-box--border-color-border-default mm-box--border-width-2 box--border-style-solid"
+            class="mm-box mm-checkbox__input mm-box--margin-0 mm-box--margin-right-2 mm-box--display-flex mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-color-border-default mm-box--border-width-2 box--border-style-solid"
             id="eth-sign-checkbox"
             title="I understand that I can lose all of my funds and NFTs if I enable eth_sign requests. "
             type="checkbox"
diff --git a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
index ea10f513d846..f9f15d211806 100644
--- a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
+++ b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
@@ -5,9 +5,15 @@ import * as actions from '../../../../store/actions';
 import Identicon from '../../../ui/identicon';
 import Button from '../../../ui/button';
 import { DEFAULT_ROUTE } from '../../../../helpers/constants/routes';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
+import { getCurrentChainId } from '../../../../selectors';
 
 function mapStateToProps(state) {
   return {
+    chainId: getCurrentChainId(state),
     token: state.appState.modal.modalState.props.token,
     history: state.appState.modal.modalState.props.history,
   };
@@ -31,11 +37,13 @@ function mapDispatchToProps(dispatch) {
 class HideTokenConfirmationModal extends Component {
   static contextTypes = {
     t: PropTypes.func,
+    trackEvent: PropTypes.func,
   };
 
   static propTypes = {
     hideToken: PropTypes.func.isRequired,
     hideModal: PropTypes.func.isRequired,
+    chainId: PropTypes.string.isRequired,
     token: PropTypes.shape({
       symbol: PropTypes.string,
       address: PropTypes.string,
@@ -47,7 +55,7 @@ class HideTokenConfirmationModal extends Component {
   state = {};
 
   render() {
-    const { token, hideToken, hideModal, history } = this.props;
+    const { chainId, token, hideToken, hideModal, history } = this.props;
     const { symbol, address, image } = token;
 
     return (
@@ -79,6 +87,15 @@ class HideTokenConfirmationModal extends Component {
             className="hide-token-confirmation__button"
             data-testid="hide-token-confirmation__hide"
             onClick={() => {
+              this.context.trackEvent({
+                event: MetaMetricsEventName.TokenRemoved,
+                category: MetaMetricsEventCategory.Tokens,
+                sensitiveProperties: {
+                  chain_id: chainId,
+                  token_contract_address: address,
+                  token_symbol: symbol,
+                },
+              });
               hideToken(address);
               history.push(DEFAULT_ROUTE);
             }}
diff --git a/ui/components/app/modals/transaction-already-confirmed/transaction-already-confirmed.tsx b/ui/components/app/modals/transaction-already-confirmed/transaction-already-confirmed.tsx
index 25605ddcdf71..1bd2afc75926 100644
--- a/ui/components/app/modals/transaction-already-confirmed/transaction-already-confirmed.tsx
+++ b/ui/components/app/modals/transaction-already-confirmed/transaction-already-confirmed.tsx
@@ -34,6 +34,8 @@ export default function TransactionAlreadyConfirmed() {
   const dispatch = useDispatch();
   const transaction: TransactionMeta = useSelector(
     (state: MetaMaskReduxState) =>
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (getTransaction as any)(state, originalTransactionId),
   );
   const rpcPrefs: NetworkClientConfiguration = useSelector(
@@ -43,7 +45,11 @@ export default function TransactionAlreadyConfirmed() {
   const viewTransaction = () => {
     // TODO: Fix getBlockExplorerLink arguments compatible with the actual controller types
     const blockExplorerLink = getBlockExplorerLink(
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       transaction as any,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       rpcPrefs as any,
     );
     global.platform.openTab({
diff --git a/ui/components/app/name/name-details/metrics.ts b/ui/components/app/name/name-details/metrics.ts
index f6f28a337dff..fe539c1a5052 100644
--- a/ui/components/app/name/name-details/metrics.ts
+++ b/ui/components/app/name/name-details/metrics.ts
@@ -29,12 +29,18 @@ export function usePetnamesMetrics({
   const trackPetnamesEvent = useCallback(
     (
       event: MetaMetricsEventName,
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       additionalProperties: Record<string, any> = {},
     ) => {
       const suggestedNameSources = [
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ...new Set(proposedNameOptions.map((option: any) => option.sourceId)),
       ];
 
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const properties: Record<string, any> = {
         petname_category: type,
         suggested_names_sources: suggestedNameSources,
@@ -57,6 +63,8 @@ export function usePetnamesMetrics({
     const isCreated = !savedName?.length && name?.length;
 
     let event: MetaMetricsEventName | null = null;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let additionalProperties: Record<string, any> = {};
 
     if (isDeleted) {
diff --git a/ui/components/app/name/name-details/name-details.tsx b/ui/components/app/name/name-details/name-details.tsx
index 25ec7f5ed407..bebfaa855675 100644
--- a/ui/components/app/name/name-details/name-details.tsx
+++ b/ui/components/app/name/name-details/name-details.tsx
@@ -156,6 +156,8 @@ function getInitialSources(
 function useProposedNames(value: string, type: NameType, chainId: string) {
   const dispatch = useDispatch();
   const { proposedNames } = useName(value, type);
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const updateInterval = useRef<any>();
   const [initialSources, setInitialSources] = useState<string[]>();
 
@@ -174,6 +176,8 @@ function useProposedNames(value: string, type: NameType, chainId: string) {
           onlyUpdateAfterDelay: true,
           variation: chainId,
         }),
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       )) as any as UpdateProposedNamesResult;
 
       if (!initialSources) {
diff --git a/ui/components/app/network-display/index.scss b/ui/components/app/network-display/index.scss
index 16755aa5f86e..9d6fa922819e 100644
--- a/ui/components/app/network-display/index.scss
+++ b/ui/components/app/network-display/index.scss
@@ -17,13 +17,14 @@
   }
 
   & .chip__label {
+    padding-left: 2px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
   & .chip__left-icon {
-    margin-left: 4px;
+    padding-left: 8px;
   }
 
   & .chip__right-icon {
diff --git a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap
index 03d6731b633d..037f736f6829 100644
--- a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap
+++ b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap
@@ -116,9 +116,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = `
         >
           <h6
             class="mm-box mm-text mm-text--body-sm mm-text--overflow-wrap-break-word mm-box--margin-bottom-4 mm-box--color-text-alternative"
-          >
-            1/18/2023
-          </h6>
+          />
         </div>
       </div>
       <div
@@ -135,7 +133,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = `
           <h6
             class="mm-box mm-text mm-text--body-sm mm-text--overflow-wrap-break-word mm-box--margin-bottom-4 mm-box--color-text-alternative"
           >
-            0.0049 ETH
+             
           </h6>
         </div>
       </div>
diff --git a/ui/components/app/nft-details/nft-details.js b/ui/components/app/nft-details/nft-details.js
index 7a9ebeea6ca9..4b9858511d6c 100644
--- a/ui/components/app/nft-details/nft-details.js
+++ b/ui/components/app/nft-details/nft-details.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
@@ -52,8 +52,12 @@ import {
 } from '../../../../shared/constants/transaction';
 import { ButtonIcon, IconName, Text } from '../../component-library';
 import Tooltip from '../../ui/tooltip';
-import { decWEIToDecETH } from '../../../../shared/modules/conversion.utils';
 import { NftItem } from '../../multichain/nft-item';
+import {
+  MetaMetricsEventName,
+  MetaMetricsEventCategory,
+} from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
 
 export default function NftDetails({ nft }) {
   const {
@@ -74,6 +78,7 @@ export default function NftDetails({ nft }) {
   const nftContracts = useSelector(getNftContracts);
   const currentNetwork = useSelector(getCurrentChainId);
   const currentChain = useSelector(getCurrentNetwork);
+  const trackEvent = useContext(MetaMetricsContext);
 
   const [addressCopied, handleAddressCopy] = useCopyToClipboard();
 
@@ -90,15 +95,47 @@ export default function NftDetails({ nft }) {
   const isImageHosted = image?.startsWith('https:');
 
   const formattedTimestamp = formatDate(
-    new Date(lastSale?.event_timestamp).getTime(),
+    new Date(lastSale?.timestamp).getTime(),
     'M/d/y',
   );
 
-  const onRemove = () => {
-    dispatch(removeAndIgnoreNft(address, tokenId));
-    dispatch(setNewNftAddedMessage(''));
-    dispatch(setRemoveNftMessage('success'));
-    history.push(DEFAULT_ROUTE);
+  const { chainId } = currentChain;
+  useEffect(() => {
+    trackEvent({
+      event: MetaMetricsEventName.NftDetailsOpened,
+      category: MetaMetricsEventCategory.Tokens,
+      properties: {
+        chain_id: chainId,
+      },
+    });
+  }, [trackEvent, chainId]);
+
+  const onRemove = async () => {
+    let isSuccessfulEvent = false;
+    try {
+      await dispatch(removeAndIgnoreNft(address, tokenId));
+      dispatch(setNewNftAddedMessage(''));
+      dispatch(setRemoveNftMessage('success'));
+      isSuccessfulEvent = true;
+    } catch (err) {
+      dispatch(setNewNftAddedMessage(''));
+      dispatch(setRemoveNftMessage('error'));
+    } finally {
+      // track event
+      trackEvent({
+        event: MetaMetricsEventName.NFTRemoved,
+        category: 'Wallet',
+        properties: {
+          token_contract_address: address,
+          tokenId: tokenId.toString(),
+          asset_type: AssetType.NFT,
+          token_standard: standard,
+          chain_id: currentNetwork,
+          isSuccessful: isSuccessfulEvent,
+        },
+      });
+      history.push(DEFAULT_ROUTE);
+    }
   };
 
   const prevNft = usePrevious(nft);
@@ -300,9 +337,8 @@ export default function NftDetails({ nft }) {
                     overflowWrap={OverflowWrap.BreakWord}
                     marginBottom={4}
                   >
-                    {`${Number(decWEIToDecETH(lastSale.total_price))} ${
-                      lastSale.payment_token.symbol
-                    }`}
+                    {lastSale?.price?.amount?.decimal}{' '}
+                    {lastSale?.price?.currency?.symbol}
                   </Text>
                 </Box>
               </Box>
@@ -387,10 +423,15 @@ NftDetails.propTypes = {
       profile_img_url: PropTypes.string,
     }),
     lastSale: PropTypes.shape({
-      event_timestamp: PropTypes.string,
-      total_price: PropTypes.string,
-      payment_token: PropTypes.shape({
-        symbol: PropTypes.string,
+      timestamp: PropTypes.string,
+      price: PropTypes.shape({
+        amount: PropTypes.shape({
+          native: PropTypes.string,
+          decimal: PropTypes.string,
+        }),
+        currency: PropTypes.shape({
+          symbol: PropTypes.string,
+        }),
       }),
     }),
   }),
diff --git a/ui/components/app/nft-details/nft-details.test.js b/ui/components/app/nft-details/nft-details.test.js
index 4aae1d61f995..91eea81ff634 100644
--- a/ui/components/app/nft-details/nft-details.test.js
+++ b/ui/components/app/nft-details/nft-details.test.js
@@ -85,7 +85,7 @@ describe('NFT Details', () => {
     expect(mockHistoryPush).toHaveBeenCalledWith(DEFAULT_ROUTE);
   });
 
-  it(`should call removeAndIgnoreNFT with proper nft details and route to '/' when removing nft`, () => {
+  it(`should call removeAndIgnoreNFT with proper nft details and route to '/' when removing nft`, async () => {
     const { queryByTestId } = renderWithProvider(
       <NftDetails {...props} />,
       mockStore,
@@ -97,7 +97,7 @@ describe('NFT Details', () => {
     const removeNftButton = queryByTestId('nft-item-remove');
     fireEvent.click(removeNftButton);
 
-    expect(removeAndIgnoreNft).toHaveBeenCalledWith(
+    await expect(removeAndIgnoreNft).toHaveBeenCalledWith(
       nfts[5].address,
       nfts[5].tokenId,
     );
@@ -105,6 +105,29 @@ describe('NFT Details', () => {
     expect(mockHistoryPush).toHaveBeenCalledWith(DEFAULT_ROUTE);
   });
 
+  it(`should call setRemoveNftMessage with error when removeAndIgnoreNft fails and route to '/'`, async () => {
+    const { queryByTestId } = renderWithProvider(
+      <NftDetails {...props} />,
+      mockStore,
+    );
+    removeAndIgnoreNft.mockImplementation(() => {
+      throw new Error('Error');
+    });
+
+    const openOptionMenuButton = queryByTestId('nft-options__button');
+    fireEvent.click(openOptionMenuButton);
+
+    const removeNftButton = queryByTestId('nft-item-remove');
+    fireEvent.click(removeNftButton);
+
+    await expect(removeAndIgnoreNft).toHaveBeenCalledWith(
+      nfts[5].address,
+      nfts[5].tokenId,
+    );
+    expect(setRemoveNftMessage).toHaveBeenCalledWith('error');
+    expect(mockHistoryPush).toHaveBeenCalledWith(DEFAULT_ROUTE);
+  });
+
   it('should copy nft address', async () => {
     const { queryByTestId } = renderWithProvider(
       <NftDetails {...props} />,
diff --git a/ui/components/app/nfts-items/nfts-items.js b/ui/components/app/nfts-items/nfts-items.js
index 899272d4a53a..6615ab928279 100644
--- a/ui/components/app/nfts-items/nfts-items.js
+++ b/ui/components/app/nfts-items/nfts-items.js
@@ -157,7 +157,7 @@ export default function NftsItems({
       updateSendAsset({
         type: AssetType.NFT,
         details: nft,
-        skipComputeEstimatedGasLimit: true,
+        skipComputeEstimatedGasLimit: false,
       }),
     );
     history.push(SEND_ROUTE);
diff --git a/ui/components/app/nfts-items/nfts-items.test.js b/ui/components/app/nfts-items/nfts-items.test.js
index cd57d3e52427..5ee1bf93b9b0 100644
--- a/ui/components/app/nfts-items/nfts-items.test.js
+++ b/ui/components/app/nfts-items/nfts-items.test.js
@@ -6,6 +6,7 @@ import { toHex } from '@metamask/controller-utils';
 import mockState from '../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import { updateNftDropDownState } from '../../../store/actions';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import NftsItems from '.';
 
 const mockHistoryPush = jest.fn();
@@ -23,9 +24,12 @@ jest.mock('../../../store/actions.ts', () => ({
   updateNftDropDownState: jest.fn().mockReturnValue(jest.fn()),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 describe('NFTs Item Component', () => {
   const nfts =
-    mockState.metamask.allNfts[mockState.metamask.selectedAddress][toHex(5)];
+    mockState.metamask.allNfts[mockSelectedInternalAccount.address][toHex(5)];
   const props = {
     collections: {
       '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
diff --git a/ui/components/app/nfts-tab/nfts-tab.js b/ui/components/app/nfts-tab/nfts-tab.js
index 0a66e3526468..f9f87ea0f8a1 100644
--- a/ui/components/app/nfts-tab/nfts-tab.js
+++ b/ui/components/app/nfts-tab/nfts-tab.js
@@ -16,6 +16,11 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useNftsCollections } from '../../../hooks/useNftsCollections';
 import {
   getCurrentNetwork,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  getIsBuyableChain,
+  getShouldHideZeroBalanceTokens,
+  getSelectedAccount,
+  ///: END:ONLY_INCLUDE_IF
   getIsMainnet,
   getUseNftDetection,
 } from '../../../selectors';
@@ -28,8 +33,6 @@ import { Box, ButtonLink, IconName, Text } from '../../component-library';
 import NFTsDetectionNoticeNFTsTab from '../nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab';
 import NftsItems from '../nfts-items';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-import { AssetListConversionButton } from '../../multichain';
-import { ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES } from '../../multichain/asset-list-conversion-button/asset-list-conversion-button';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
 ///: END:ONLY_INCLUDE_IF
 import { MetaMetricsContext } from '../../../contexts/metametrics';
@@ -39,6 +42,13 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { getCurrentLocale } from '../../../ducks/locale/locale';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+import {
+  RAMPS_CARD_VARIANT_TYPES,
+  RampsCard,
+} from '../../multichain/ramps-card/ramps-card';
+import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance';
+///: END:ONLY_INCLUDE_IF
 
 export default function NftsTab() {
   const useNftDetection = useSelector(getUseNftDetection);
@@ -48,6 +58,20 @@ export default function NftsTab() {
   const dispatch = useDispatch();
   const trackEvent = useContext(MetaMetricsContext);
 
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  const { address: selectedAddress } = useSelector(getSelectedAccount);
+  const shouldHideZeroBalanceTokens = useSelector(
+    getShouldHideZeroBalanceTokens,
+  );
+  const { totalFiatBalance } = useAccountTotalFiatBalance(
+    selectedAddress,
+    shouldHideZeroBalanceTokens,
+  );
+  const balanceIsZero = Number(totalFiatBalance) === 0;
+  const isBuyableChain = useSelector(getIsBuyableChain);
+  const showRampsCard = isBuyableChain && balanceIsZero;
+  ///: END:ONLY_INCLUDE_IF
+
   const { nftsLoading, collections, previouslyOwnedCollection } =
     useNftsCollections();
 
@@ -64,160 +88,149 @@ export default function NftsTab() {
 
   const hasAnyNfts = Object.keys(collections).length > 0;
   const showNftBanner = hasAnyNfts === false;
-  const currentNetwork = useSelector(getCurrentNetwork);
+  const { chainId, nickname } = useSelector(getCurrentNetwork);
   const currentLocale = useSelector(getCurrentLocale);
+
   useEffect(() => {
-    if (!showNftBanner) {
+    if (nftsLoading || !showNftBanner) {
       return;
     }
     trackEvent({
       event: MetaMetricsEventName.EmptyNftsBannerDisplayed,
       category: MetaMetricsEventCategory.Navigation,
       properties: {
-        chain_id: currentNetwork.chainId,
+        chain_id: chainId,
         locale: currentLocale,
-        network: currentNetwork.nickname,
+        network: nickname,
         referrer: ORIGIN_METAMASK,
       },
     });
-  }, [showNftBanner, trackEvent, currentNetwork, currentLocale]);
+  }, [
+    nftsLoading,
+    showNftBanner,
+    trackEvent,
+    chainId,
+    nickname,
+    currentLocale,
+  ]);
 
   if (nftsLoading) {
     return <div className="nfts-tab__loading">{t('loadingNFTs')}</div>;
   }
 
   return (
-    <Box className="nfts-tab">
-      {hasAnyNfts > 0 || previouslyOwnedCollection.nfts.length > 0 ? (
-        <NftsItems
-          collections={collections}
-          previouslyOwnedCollection={previouslyOwnedCollection}
-        />
-      ) : (
-        <>
-          {isMainnet && !useNftDetection ? (
-            <Box paddingTop={4} paddingInlineStart={4} paddingInlineEnd={4}>
-              <NFTsDetectionNoticeNFTsTab />
-            </Box>
-          ) : null}
-          {
-            ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-            showNftBanner ? (
-              <Box
-                paddingInlineStart={4}
-                paddingInlineEnd={4}
-                display={Display.Flex}
-                paddingTop={4}
-              >
-                <AssetListConversionButton
-                  variant={ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.NFT}
-                  onClick={() => {
-                    global.platform.openTab({ url: ZENDESK_URLS.NFT_TOKENS });
-                    trackEvent({
-                      event: MetaMetricsEventName.EmptyNftsBannerClicked,
-                      properties: {
-                        chain_id: currentNetwork.chainId,
-                        locale: currentLocale,
-                        network: currentNetwork.nickname,
-                        referrer: ORIGIN_METAMASK,
-                      },
-                    });
-                  }}
-                />
+    <>
+      {
+        ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+        showRampsCard ? (
+          <RampsCard variant={RAMPS_CARD_VARIANT_TYPES.NFT} />
+        ) : null
+        ///: END:ONLY_INCLUDE_IF
+      }
+      <Box className="nfts-tab">
+        {hasAnyNfts > 0 || previouslyOwnedCollection.nfts.length > 0 ? (
+          <NftsItems
+            collections={collections}
+            previouslyOwnedCollection={previouslyOwnedCollection}
+          />
+        ) : (
+          <>
+            {isMainnet && !useNftDetection ? (
+              <Box paddingTop={4} paddingInlineStart={4} paddingInlineEnd={4}>
+                <NFTsDetectionNoticeNFTsTab />
               </Box>
-            ) : null
-            ///: END:ONLY_INCLUDE_IF
-          }
-          <Box
-            padding={12}
-            display={Display.Flex}
-            flexDirection={FlexDirection.Column}
-            alignItems={AlignItems.center}
-            justifyContent={JustifyContent.center}
-          >
-            <Box justifyContent={JustifyContent.center}>
-              <img src="./images/no-nfts.svg" />
-            </Box>
+            ) : null}
             <Box
-              marginTop={4}
-              marginBottom={12}
+              padding={12}
               display={Display.Flex}
-              justifyContent={JustifyContent.center}
-              alignItems={AlignItems.center}
               flexDirection={FlexDirection.Column}
-              className="nfts-tab__link"
+              alignItems={AlignItems.center}
+              justifyContent={JustifyContent.center}
             >
-              <Text
-                color={TextColor.textMuted}
-                variant={TextVariant.headingSm}
-                align={TextAlign.Center}
-                as="h4"
+              <Box justifyContent={JustifyContent.center}>
+                <img src="./images/no-nfts.svg" />
+              </Box>
+              <Box
+                marginTop={4}
+                marginBottom={12}
+                display={Display.Flex}
+                justifyContent={JustifyContent.center}
+                alignItems={AlignItems.center}
+                flexDirection={FlexDirection.Column}
+                className="nfts-tab__link"
               >
-                {t('noNFTs')}
-              </Text>
-              {
-                ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-                <ButtonLink
-                  size={Size.MD}
-                  href={ZENDESK_URLS.NFT_TOKENS}
-                  externalLink
+                <Text
+                  color={TextColor.textMuted}
+                  variant={TextVariant.headingSm}
+                  align={TextAlign.Center}
+                  as="h4"
                 >
-                  {t('learnMoreUpperCase')}
-                </ButtonLink>
-                ///: END:ONLY_INCLUDE_IF
-              }
-            </Box>
-          </Box>
-        </>
-      )}
-      <Box
-        className="nfts-tab__buttons"
-        display={Display.Flex}
-        flexDirection={FlexDirection.Column}
-        alignItems={AlignItems.flexStart}
-        margin={4}
-        gap={2}
-        marginBottom={2}
-      >
-        <ButtonLink
-          size={Size.MD}
-          data-testid="import-nft-button"
-          startIconName={IconName.Add}
-          onClick={() => {
-            dispatch(showImportNftsModal());
-          }}
-        >
-          {t('importNFT')}
-        </ButtonLink>
-        {!isMainnet && Object.keys(collections).length < 1 ? null : (
-          <>
-            <Box
-              className="nfts-tab__link"
-              justifyContent={JustifyContent.flexEnd}
-            >
-              {isMainnet && !useNftDetection ? (
-                <ButtonLink
-                  size={Size.MD}
-                  startIconName={IconName.Setting}
-                  data-testid="refresh-list-button"
-                  onClick={onEnableAutoDetect}
-                >
-                  {t('enableAutoDetect')}
-                </ButtonLink>
-              ) : (
-                <ButtonLink
-                  size={Size.MD}
-                  startIconName={IconName.Refresh}
-                  data-testid="refresh-list-button"
-                  onClick={onRefresh}
-                >
-                  {t('refreshList')}
-                </ButtonLink>
-              )}
+                  {t('noNFTs')}
+                </Text>
+                {
+                  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+                  <ButtonLink
+                    size={Size.MD}
+                    href={ZENDESK_URLS.NFT_TOKENS}
+                    externalLink
+                  >
+                    {t('learnMoreUpperCase')}
+                  </ButtonLink>
+                  ///: END:ONLY_INCLUDE_IF
+                }
+              </Box>
             </Box>
           </>
         )}
+        <Box
+          className="nfts-tab__buttons"
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          alignItems={AlignItems.flexStart}
+          margin={4}
+          gap={2}
+          marginBottom={2}
+        >
+          <ButtonLink
+            size={Size.MD}
+            data-testid="import-nft-button"
+            startIconName={IconName.Add}
+            onClick={() => {
+              dispatch(showImportNftsModal());
+            }}
+          >
+            {t('importNFT')}
+          </ButtonLink>
+          {!isMainnet && Object.keys(collections).length < 1 ? null : (
+            <>
+              <Box
+                className="nfts-tab__link"
+                justifyContent={JustifyContent.flexEnd}
+              >
+                {isMainnet && !useNftDetection ? (
+                  <ButtonLink
+                    size={Size.MD}
+                    startIconName={IconName.Setting}
+                    data-testid="refresh-list-button"
+                    onClick={onEnableAutoDetect}
+                  >
+                    {t('enableAutoDetect')}
+                  </ButtonLink>
+                ) : (
+                  <ButtonLink
+                    size={Size.MD}
+                    startIconName={IconName.Refresh}
+                    data-testid="refresh-list-button"
+                    onClick={onRefresh}
+                  >
+                    {t('refreshList')}
+                  </ButtonLink>
+                )}
+              </Box>
+            </>
+          )}
+        </Box>
       </Box>
-    </Box>
+    </>
   );
 }
diff --git a/ui/components/app/nfts-tab/nfts-tab.test.js b/ui/components/app/nfts-tab/nfts-tab.test.js
index 651a42fd3a63..0ee9a7179e85 100644
--- a/ui/components/app/nfts-tab/nfts-tab.test.js
+++ b/ui/components/app/nfts-tab/nfts-tab.test.js
@@ -6,9 +6,11 @@ import configureStore from '../../../store/store';
 import { renderWithProvider } from '../../../../test/jest';
 import { SECURITY_ROUTE } from '../../../helpers/constants/routes';
 import { setBackgroundConnection } from '../../../store/background-connection';
-import { NETWORK_TYPES } from '../../../../shared/constants/network';
+import { CHAIN_IDS, NETWORK_TYPES } from '../../../../shared/constants/network';
 import NftsTab from '.';
 
+const ETH_BALANCE = '0x16345785d8a0000'; // 0.1 ETH
+
 const NFTS = [
   {
     address: '0x495f947276749Ce646f68AC8c248420045cb7b5e',
@@ -152,6 +154,7 @@ const render = ({
   selectedAddress,
   chainId = '0x1',
   useNftDetection,
+  balance = ETH_BALANCE,
 }) => {
   const store = configureStore({
     metamask: {
@@ -166,7 +169,16 @@ const render = ({
         },
       },
       providerConfig: { chainId, type: NETWORK_TYPES.MAINNET },
-      selectedAddress,
+      accounts: {
+        [selectedAddress]: {
+          address: selectedAddress,
+        },
+      },
+      accountsByChainId: {
+        [CHAIN_IDS.MAINNET]: {
+          [selectedAddress]: { balance },
+        },
+      },
       internalAccounts: {
         accounts: {
           'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -185,6 +197,8 @@ const render = ({
         },
         selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
       },
+      currentCurrency: 'usd',
+      tokenList: {},
       useNftDetection,
       nftsDropdownState,
     },
@@ -278,6 +292,7 @@ describe('NFT Items', () => {
       expect(screen.queryByText('Munks (3)')).not.toBeInTheDocument();
     });
   });
+
   describe('NFTs options', () => {
     it('should render a link "Refresh list" when some NFTs are present on mainnet and NFT auto-detection preference is set to true, which, when clicked calls methods DetectNFTs and checkAndUpdateNftsOwnershipStatus', () => {
       render({
@@ -316,23 +331,21 @@ describe('NFT Items', () => {
     });
   });
 
-  describe('nft conversion banner', () => {
-    it('shows the NFT conversion banner when there are no NFTs', () => {
+  describe('NFT Tab Ramps Card', () => {
+    it('shows the ramp card when user balance is zero', () => {
       const { queryByText } = render({
         selectedAddress: ACCOUNT_1,
-        nfts: [],
+        balance: '0x0',
       });
-
-      expect(queryByText('Learn more about NFTs')).toBeInTheDocument();
+      expect(queryByText('Get ETH to buy NFTs')).toBeInTheDocument();
     });
 
-    it('does not show the NFT conversion banner when there are NFTs', () => {
+    it('does not show the ramp card when the account has a balance', () => {
       const { queryByText } = render({
         selectedAddress: ACCOUNT_1,
-        nfts: NFTS,
+        balance: ETH_BALANCE,
       });
-
-      expect(queryByText('Learn more about NFTs')).not.toBeInTheDocument();
+      expect(queryByText('Get ETH to buy NFTs')).not.toBeInTheDocument();
     });
   });
 });
diff --git a/ui/components/app/permission-cell/index.scss b/ui/components/app/permission-cell/index.scss
index 6836e197185f..0f753505160c 100644
--- a/ui/components/app/permission-cell/index.scss
+++ b/ui/components/app/permission-cell/index.scss
@@ -5,7 +5,7 @@
 
   &__status {
     &__accounts-group-box {
-      vertical-align: top;
+      vertical-align: sub;
     }
   }
 }
diff --git a/ui/components/app/permission-connect-header/index.js b/ui/components/app/permission-connect-header/index.js
new file mode 100644
index 000000000000..f4fcdc5904d5
--- /dev/null
+++ b/ui/components/app/permission-connect-header/index.js
@@ -0,0 +1 @@
+export { default } from './permission-connect-header';
diff --git a/ui/components/app/permission-connect-header/permission-connect-header.js b/ui/components/app/permission-connect-header/permission-connect-header.js
new file mode 100644
index 000000000000..c3f1c248b034
--- /dev/null
+++ b/ui/components/app/permission-connect-header/permission-connect-header.js
@@ -0,0 +1,95 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  AlignItems,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+  Display,
+  BlockSize,
+  FontWeight,
+  FlexDirection,
+  BackgroundColor,
+} from '../../../helpers/constants/design-system';
+import {
+  IconSize,
+  Text,
+  Box,
+  AvatarFavicon,
+  AvatarBase,
+} from '../../component-library';
+import { getAvatarFallbackLetter } from '../../../helpers/utils/util';
+
+const PermissionConnectHeader = ({ origin, iconUrl }) => {
+  const transformOriginToTitle = (rawOrigin) => {
+    try {
+      const url = new URL(rawOrigin);
+      const parts = url.hostname.split('.');
+      return parts.slice(-2).join('.');
+    } catch (e) {
+      return 'Unknown Origin';
+    }
+  };
+  const title = transformOriginToTitle(origin);
+
+  return (
+    <Box
+      backgroundColor={BackgroundColor.backgroundDefault}
+      width={BlockSize.Full}
+      alignItems={AlignItems.center}
+      display={Display.Flex}
+      padding={4}
+      style={{
+        boxShadow: 'var(--shadow-size-lg) var(--color-shadow-default)',
+      }}
+    >
+      <Box>
+        {iconUrl ? (
+          <AvatarFavicon
+            backgroundColor={BackgroundColor.backgroundAlternative}
+            size={IconSize.Lg}
+            src={iconUrl}
+            name={title}
+          />
+        ) : (
+          <AvatarBase
+            size={IconSize.Lg}
+            display={Display.Flex}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+            color={TextColor.textAlternative}
+            style={{ borderWidth: '0px' }}
+            backgroundColor={BackgroundColor.backgroundAlternative}
+          >
+            {getAvatarFallbackLetter(title)}
+          </AvatarBase>
+        )}
+      </Box>
+      <Box
+        marginLeft={4}
+        marginRight={4}
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        style={{ overflow: 'hidden' }}
+      >
+        <Text ellipsis fontWeight={FontWeight.Medium}>
+          {title}
+        </Text>
+        <Text
+          ellipsis
+          variant={TextVariant.bodySm}
+          color={TextColor.textAlternative}
+        >
+          {origin}
+        </Text>
+      </Box>
+    </Box>
+  );
+};
+
+PermissionConnectHeader.propTypes = {
+  origin: PropTypes.string,
+  iconUrl: PropTypes.string,
+};
+
+export default PermissionConnectHeader;
diff --git a/ui/components/app/permission-connect-header/permission-connect-header.stories.js b/ui/components/app/permission-connect-header/permission-connect-header.stories.js
new file mode 100644
index 000000000000..2d6e60f5f4bb
--- /dev/null
+++ b/ui/components/app/permission-connect-header/permission-connect-header.stories.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import PermissionConnectHeader from '.';
+
+export default {
+  title: 'Components/App/PermissionConnectHeader',
+  component: PermissionConnectHeader,
+};
+
+export const DefaultStory = (args) => <PermissionConnectHeader {...args} />;
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  title: 'E2E Test Dapp',
+  origin: 'https://metamask.github.io',
+  iconUrl: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
+};
+
+export const HeaderWithFallbackIcon = (args) => (
+  <PermissionConnectHeader {...args} />
+);
+
+HeaderWithFallbackIcon.args = {
+  title: 'E2E Test Dapp',
+  origin: 'https://metamask.github.io',
+  iconUrl: '',
+};
+
+export const HeaderWithFallbackTitle = (args) => (
+  <PermissionConnectHeader {...args} />
+);
+
+HeaderWithFallbackTitle.args = {
+  title: 'https://metamask.github.io',
+  origin: 'https://metamask.github.io',
+  iconUrl: '',
+};
diff --git a/ui/components/app/permission-connect-header/permission-connect-header.test.js b/ui/components/app/permission-connect-header/permission-connect-header.test.js
new file mode 100644
index 000000000000..51b53b3d0f1f
--- /dev/null
+++ b/ui/components/app/permission-connect-header/permission-connect-header.test.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest';
+import PermissionConnectHeader from './permission-connect-header';
+
+describe('Permission Connect Header', () => {
+  const mockOriginData = {
+    origin: 'https://metamask.github.io',
+    iconUrl: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
+  };
+  const expectedTitle = 'github.io';
+  const expectedAltImageText = 'github.io logo';
+
+  it('renders permission connect header', () => {
+    const { getByAltText } = renderWithProvider(
+      <PermissionConnectHeader
+        origin={mockOriginData.origin}
+        iconUrl={mockOriginData.iconUrl}
+      />,
+    );
+
+    expect(screen.getByText(expectedTitle)).toBeInTheDocument();
+    expect(screen.getByText(mockOriginData.origin)).toBeInTheDocument();
+    expect(getByAltText(expectedAltImageText)).toBeInTheDocument();
+
+    const imgTag = getByAltText(expectedAltImageText);
+    expect(imgTag).toHaveAttribute('src', mockOriginData.iconUrl);
+  });
+
+  it('renders permission connect header with fallback icon', () => {
+    renderWithProvider(
+      <PermissionConnectHeader
+        origin={mockOriginData.origin}
+        iconUrl={undefined}
+      />,
+    );
+
+    expect(screen.getByText(expectedTitle)).toBeInTheDocument();
+    expect(screen.getByText(mockOriginData.origin)).toBeInTheDocument();
+    expect(screen.getByText(expectedTitle.charAt(0))).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/permission-page-container/index.scss b/ui/components/app/permission-page-container/index.scss
index 69a326001353..118a9ff639fa 100644
--- a/ui/components/app/permission-page-container/index.scss
+++ b/ui/components/app/permission-page-container/index.scss
@@ -1,126 +1,3 @@
-@use "design-system";
-
-.permission-approval-container {
-  &.page-container {
-    display: flex;
-    border: none;
-    box-shadow: none;
-    width: 100%;
-    margin-top: 2px;
-    height: 100%;
-    flex-direction: column;
-    justify-content: space-between;
-  }
-
-  &__footers {
-    width: 100%;
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-
-    .page-container__footer {
-      align-items: center;
-      margin-top: 12px;
-
-      @include design-system.screen-sm-min {
-        border-top: none;
-      }
-
-      footer {
-        width: 100%;
-      }
-    }
-  }
-
-  &__title {
-    @include design-system.H4;
-
-    text-align: center;
-    margin-top: 32px;
-    width: 100%;
-  }
-
-  &__content {
-    display: flex;
-    overflow-y: auto;
-    flex-direction: column;
-    color: var(--color-text-default);
-    padding-left: 24px;
-    padding-right: 24px;
-    margin-top: 2px;
-
-    a,
-    a:hover {
-      color: var(--color-primary-default);
-    }
-
-    &__requested {
-      width: 100%;
-      text-align: left;
-    }
-
-    &__revoke-note {
-      margin-top: 60px;
-    }
-
-    &__permission {
-      display: flex;
-      align-items: center;
-
-      label {
-        @include design-system.H6;
-
-        margin-left: 16px;
-        color: var(--color-text-default);
-      }
-    }
-  }
-
-  & &__checkbox {
-    font-size: 1.4rem;
-    margin: 0;
-  }
-
-  &__content-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  &__permissions-header {
-    @include design-system.H6;
-
-    color: var(--color-text-default);
-  }
-
-  &__permissions-container {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    margin-top: 38px;
-  }
-
-  @include design-system.screen-sm-max {
-    &__title {
-      position: initial;
-    }
-
-    &__content-approval-visual {
-      margin-top: 16px;
-    }
-
-    .page-container__footer header {
-      padding: 0;
-    }
-  }
-
-  &__tooltip-body {
-    display: flex;
-    flex-direction: column;
-  }
-
-  &__bold-title-elements {
-    font-weight: bold;
-  }
+.permission-page-container-footer {
+  border-top: none !important;
 }
diff --git a/ui/components/app/permission-page-container/permission-page-container-content/permission-page-container-content.component.js b/ui/components/app/permission-page-container/permission-page-container-content/permission-page-container-content.component.js
index 719fc96f06ad..ce50f40b2573 100644
--- a/ui/components/app/permission-page-container/permission-page-container-content/permission-page-container-content.component.js
+++ b/ui/components/app/permission-page-container/permission-page-container-content/permission-page-container-content.component.js
@@ -1,11 +1,19 @@
 import PropTypes from 'prop-types';
 import React, { PureComponent } from 'react';
-///: BEGIN:ONLY_INCLUDE_IF(snaps)
-import { SubjectType } from '@metamask/permission-controller';
-///: END:ONLY_INCLUDE_IF
-import PermissionsConnectHeader from '../../permissions-connect-header';
-import Tooltip from '../../../ui/tooltip';
 import PermissionsConnectPermissionList from '../../permissions-connect-permission-list';
+import {
+  AlignItems,
+  BackgroundColor,
+  BlockSize,
+  BorderRadius,
+  Display,
+  FlexDirection,
+  FontWeight,
+  JustifyContent,
+  TextAlign,
+  TextVariant,
+} from '../../../../helpers/constants/design-system';
+import { Box, Text } from '../../../component-library';
 
 export default class PermissionPageContainerContent extends PureComponent {
   static propTypes = {
@@ -18,125 +26,80 @@ export default class PermissionPageContainerContent extends PureComponent {
     }),
     selectedPermissions: PropTypes.object.isRequired,
     selectedAccounts: PropTypes.array,
-    allAccountsSelected: PropTypes.bool,
   };
 
   static defaultProps = {
     selectedAccounts: [],
-    allAccountsSelected: false,
   };
 
   static contextTypes = {
     t: PropTypes.func,
   };
 
-  renderRequestedPermissions() {
-    const { selectedPermissions, subjectMetadata } = this.props;
-
-    return (
-      <div className="permission-approval-container__content__requested">
-        <PermissionsConnectPermissionList
-          permissions={selectedPermissions}
-          subjectName={subjectMetadata.origin}
-        />
-      </div>
-    );
-  }
-
-  renderAccountTooltip(textContent) {
-    const { selectedAccounts } = this.props;
-    const { t } = this.context;
-
-    return (
-      <Tooltip
-        key="all-account-connect-tooltip"
-        position="bottom"
-        wrapperClassName="permission-approval-container__bold-title-elements"
-        html={
-          <div style={{ display: 'flex', flexDirection: 'column' }}>
-            {selectedAccounts.slice(0, 6).map((account, index) => {
-              return (
-                <div key={`tooltip-account-${index}`}>
-                  {account.addressLabel}
-                </div>
-              );
-            })}
-            {selectedAccounts.length > 6
-              ? t('plusXMore', [selectedAccounts.length - 6])
-              : null}
-          </div>
-        }
-      >
-        {textContent}
-      </Tooltip>
-    );
-  }
-
-  getTitle() {
-    const {
-      subjectMetadata,
-      selectedAccounts,
-      allAccountsSelected,
-      selectedPermissions,
-    } = this.props;
-    const { t } = this.context;
-
-    if (subjectMetadata.extensionId) {
-      return t('externalExtension', [subjectMetadata.extensionId]);
-    } else if (!selectedPermissions.eth_accounts) {
-      return t('permissionRequestCapitalized');
-    } else if (allAccountsSelected) {
-      return t('connectToAll', [
-        this.renderAccountTooltip(t('connectToAllAccounts')),
-      ]);
-    } else if (selectedAccounts.length > 1) {
-      return t('connectToMultiple', [
-        this.renderAccountTooltip(
-          t('connectToMultipleNumberOfAccounts', [selectedAccounts.length]),
-        ),
-      ]);
-    }
-    return t('connectTo', [selectedAccounts[0]?.addressLabel]);
-  }
-
-  getHeaderText() {
-    const { subjectMetadata } = this.props;
-    const { t } = this.context;
-
-    ///: BEGIN:ONLY_INCLUDE_IF(snaps)
-    if (subjectMetadata.subjectType === SubjectType.Snap) {
-      return t('allowThisSnapTo');
-    }
-    ///: END:ONLY_INCLUDE_IF
-
-    return subjectMetadata.extensionId
-      ? t('allowExternalExtensionTo', [subjectMetadata.extensionId])
-      : t('allowThisSiteTo');
-  }
-
   render() {
-    const { subjectMetadata } = this.props;
+    const { t } = this.context;
 
-    const title = this.getTitle();
+    const { selectedPermissions, selectedAccounts, subjectMetadata } =
+      this.props;
 
-    const headerText = this.getHeaderText();
+    const accounts = selectedAccounts.reduce((accumulator, account) => {
+      accumulator.push({
+        avatarValue: account.address,
+        avatarName: account.label,
+      });
+      return accumulator;
+    }, []);
 
     return (
-      <div className="permission-approval-container__content">
-        <div className="permission-approval-container__content-container">
-          <PermissionsConnectHeader
-            iconUrl={subjectMetadata.iconUrl}
-            iconName={subjectMetadata.name}
-            headerTitle={title}
-            headerText={headerText}
-            siteOrigin={subjectMetadata.origin}
-            subjectType={subjectMetadata.subjectType}
+      <Box
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        justifyContent={JustifyContent.flexStart}
+        alignItems={AlignItems.center}
+        height={BlockSize.Full}
+        paddingLeft={4}
+        paddingRight={4}
+        backgroundColor={BackgroundColor.backgroundAlternative}
+      >
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          justifyContent={JustifyContent.center}
+          alignItems={AlignItems.center}
+          paddingTop={4}
+          paddingBottom={4}
+        >
+          <Text variant={TextVariant.headingMd} textAlign={TextAlign.Center}>
+            {t('permissions')}
+          </Text>
+          <Text variant={TextVariant.bodyMd} textAlign={TextAlign.Center}>
+            {t('nativePermissionRequestDescription', [
+              <Text
+                as="span"
+                key={`description_key_${subjectMetadata.origin}`}
+                fontWeight={FontWeight.Medium}
+              >
+                {subjectMetadata.origin}
+              </Text>,
+            ])}
+          </Text>
+        </Box>
+        <Box
+          display={Display.Flex}
+          backgroundColor={BackgroundColor.backgroundDefault}
+          paddingLeft={4}
+          paddingRight={4}
+          paddingTop={2}
+          paddingBottom={2}
+          borderRadius={BorderRadius.XL}
+        >
+          <PermissionsConnectPermissionList
+            permissions={selectedPermissions}
+            subjectName={subjectMetadata.origin}
+            accounts={accounts}
           />
-          <section className="permission-approval-container__permissions-container">
-            {this.renderRequestedPermissions()}
-          </section>
-        </div>
-      </div>
+        </Box>
+      </Box>
     );
   }
 }
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 a4eaae6dbb0d..853ddd342b65 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
@@ -15,6 +15,12 @@ import { RestrictedMethods } from '../../../../shared/constants/permissions';
 import SnapPrivacyWarning from '../snaps/snap-privacy-warning';
 import { getDedupedSnaps } from '../../../helpers/utils/util';
 ///: END:ONLY_INCLUDE_IF
+import {
+  BackgroundColor,
+  Display,
+  FlexDirection,
+} from '../../../helpers/constants/design-system';
+import { Box } from '../../component-library';
 import { PermissionPageContainerContent } from '.';
 
 export default class PermissionPageContainer extends Component {
@@ -37,6 +43,8 @@ export default class PermissionPageContainer extends Component {
       extensionId: PropTypes.string,
       iconUrl: PropTypes.string,
     }),
+    history: PropTypes.object.isRequired,
+    connectPath: PropTypes.string.isRequired,
   };
 
   static defaultProps = {
@@ -117,6 +125,11 @@ export default class PermissionPageContainer extends Component {
     ///: END:ONLY_INCLUDE_IF
   }
 
+  goBack() {
+    const { history, connectPath } = this.props;
+    history.push(connectPath);
+  }
+
   onCancel = () => {
     const { request, rejectPermissionsRequest } = this.props;
     rejectPermissionsRequest(request.metadata.id);
@@ -189,19 +202,24 @@ export default class PermissionPageContainer extends Component {
           selectedAccounts={selectedAccounts}
           allAccountsSelected={allAccountsSelected}
         />
-        <div className="permission-approval-container__footers">
+        <Box
+          display={Display.Flex}
+          backgroundColor={BackgroundColor.backgroundAlternative}
+          flexDirection={FlexDirection.Column}
+        >
           {targetSubjectMetadata?.subjectType !== SubjectType.Snap && (
             <PermissionsConnectFooter />
           )}
           <PageContainerFooter
+            footerClassName="permission-page-container-footer"
             cancelButtonType="default"
-            onCancel={() => this.onCancel()}
-            cancelText={this.context.t('cancel')}
+            onCancel={() => this.goBack()}
+            cancelText={this.context.t('back')}
             onSubmit={() => this.onSubmit()}
-            submitText={this.context.t('connect')}
+            submitText={this.context.t('confirm')}
             buttonSizeLarge={false}
           />
-        </div>
+        </Box>
       </>
     );
   }
diff --git a/ui/components/app/permissions-connect-footer/index.scss b/ui/components/app/permissions-connect-footer/index.scss
deleted file mode 100644
index 02ab2c898d39..000000000000
--- a/ui/components/app/permissions-connect-footer/index.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-@use "design-system";
-
-.permissions-connect-footer {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  align-items: center;
-
-  &__text {
-    @include design-system.H7;
-
-    color: var(--color-text-alternative);
-    display: flex;
-    margin-top: 10px;
-
-    &--link {
-      color: var(--color-primary-default);
-      margin-left: 4px;
-      cursor: pointer;
-    }
-  }
-}
diff --git a/ui/components/app/permissions-connect-footer/permissions-connect-footer.component.js b/ui/components/app/permissions-connect-footer/permissions-connect-footer.component.js
index f1575a6db723..65bb66072e8f 100644
--- a/ui/components/app/permissions-connect-footer/permissions-connect-footer.component.js
+++ b/ui/components/app/permissions-connect-footer/permissions-connect-footer.component.js
@@ -1,6 +1,13 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
+import {
+  AlignItems,
+  Display,
+  JustifyContent,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import { Box, ButtonLink, ButtonLinkSize, Text } from '../../component-library';
 
 export default class PermissionsConnectFooter extends Component {
   static contextTypes = {
@@ -10,21 +17,28 @@ export default class PermissionsConnectFooter extends Component {
   render() {
     const { t } = this.context;
     return (
-      <div className="permissions-connect-footer">
-        <div className="permissions-connect-footer__text">
-          <div>{t('onlyConnectTrust')}</div>
-          <div
-            className="permissions-connect-footer__text--link"
-            onClick={() => {
-              global.platform.openTab({
-                url: ZENDESK_URLS.USER_GUIDE_DAPPS,
-              });
-            }}
-          >
-            {t('learnMoreUpperCase')}
-          </div>
-        </div>
-      </div>
+      <Box
+        display={Display.Flex}
+        alignItems={AlignItems.center}
+        justifyContent={JustifyContent.center}
+      >
+        <Text variant={TextVariant.bodyMd}>
+          {t('onlyConnectTrust', [
+            <ButtonLink
+              key="permission-connect-footer-learn-more-link"
+              size={ButtonLinkSize.Inherit}
+              target="_blank"
+              onClick={() => {
+                global.platform.openTab({
+                  url: ZENDESK_URLS.USER_GUIDE_DAPPS,
+                });
+              }}
+            >
+              {t('learnMoreUpperCase')}
+            </ButtonLink>,
+          ])}
+        </Text>
+      </Box>
     );
   }
 }
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 a8d07ce4ce77..3c6f748a0f09 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,53 +1,59 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
-import {
-  getRightIcon,
-  getWeightedPermissions,
-} from '../../../helpers/utils/permission';
+import { getWeightedPermissions } from '../../../helpers/utils/permission';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getSnapsMetadata } from '../../../selectors';
 import { getSnapName } from '../../../helpers/utils/util';
+import PermissionCell from '../permission-cell';
+import { Box } from '../../component-library';
 
 /**
  * Get one or more permission descriptions for a permission name.
  *
  * @param permission - The permission to render.
  * @param index - The index of the permission.
+ * @param accounts - An array representing list of accounts for which permission is used.
  * @returns {JSX.Element} A permission description node.
  */
-function getDescriptionNode(permission, index) {
-  const { label, leftIcon, permissionName } = permission;
-
+function getDescriptionNode(permission, index, accounts) {
   return (
-    <div className="permission" key={`${permissionName}-${index}`}>
-      {typeof leftIcon === 'string' ? <i className={leftIcon} /> : leftIcon}
-      {label}
-      {getRightIcon(permission)}
-    </div>
+    <PermissionCell
+      permissionName={permission.name}
+      title={permission.label}
+      description={permission.description}
+      weight={permission.weight}
+      avatarIcon={permission.leftIcon}
+      key={`${permission.permissionName}-${index}`}
+      accounts={accounts}
+    />
   );
 }
 
 export default function PermissionsConnectPermissionList({
   permissions,
   subjectName,
+  accounts,
 }) {
   const t = useI18nContext();
   const snapsMetadata = useSelector(getSnapsMetadata);
 
   return (
-    <div className="permissions-connect-permission-list">
+    <Box as="span">
       {getWeightedPermissions({
         t,
         permissions,
         getSubjectName: getSnapName(snapsMetadata),
         subjectName,
-      }).map(getDescriptionNode)}
-    </div>
+      }).map((permission, index) =>
+        getDescriptionNode(permission, index, accounts),
+      )}
+    </Box>
   );
 }
 
 PermissionsConnectPermissionList.propTypes = {
   permissions: PropTypes.object.isRequired,
   subjectName: PropTypes.string.isRequired,
+  accounts: PropTypes.arrayOf(PropTypes.object),
 };
diff --git a/ui/components/app/smart-transactions/index.scss b/ui/components/app/smart-transactions/index.scss
new file mode 100644
index 000000000000..c7c6ae34efe1
--- /dev/null
+++ b/ui/components/app/smart-transactions/index.scss
@@ -0,0 +1,26 @@
+.mm-smart-transactions-opt-in-modal {
+  &__benefit {
+    flex: 1;
+  }
+
+  &__icon {
+    --size: 40px;
+  }
+
+  &__no-thanks-link {
+    opacity: 75%;
+
+    &:hover {
+      color: var(--color-text-alternative) !important;
+      text-decoration: none !important;
+    }
+  }
+
+  .mm-modal-content {
+    &__dialog {
+      background-image: url('/images/smart-transactions/smart-transactions-opt-in-background.svg');
+      background-position: -80px 16px;
+      background-repeat: no-repeat;
+    }
+  }
+}
diff --git a/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx b/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx
new file mode 100644
index 000000000000..38921b5bf3dc
--- /dev/null
+++ b/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx
@@ -0,0 +1,221 @@
+import React, { useCallback, useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  TextColor,
+  Display,
+  FlexDirection,
+  BlockSize,
+  AlignItems,
+  TextAlign,
+  JustifyContent,
+  TextVariant,
+  IconColor,
+  FontWeight,
+} from '../../../helpers/constants/design-system';
+import {
+  Modal,
+  ModalOverlay,
+  Text,
+  Box,
+  Button,
+  ButtonVariant,
+  ModalHeader,
+  ModalContent,
+  ButtonLink,
+  ButtonLinkSize,
+  Icon,
+  IconName,
+} from '../../component-library';
+import { setSmartTransactionsOptInStatus } from '../../../store/actions';
+import { SMART_TRANSACTIONS_LEARN_MORE_URL } from '../../../../shared/constants/smartTransactions';
+
+export type SmartTransactionsOptInModalProps = {
+  isOpen: boolean;
+  hideWhatsNewPopup: () => void;
+};
+
+const LearnMoreLink = () => {
+  const t = useI18nContext();
+  return (
+    <ButtonLink
+      size={ButtonLinkSize.Inherit}
+      textProps={{
+        variant: TextVariant.bodyMd,
+        alignItems: AlignItems.flexStart,
+      }}
+      as="a"
+      href={SMART_TRANSACTIONS_LEARN_MORE_URL}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {t('learnMoreUpperCaseWithDot')}
+    </ButtonLink>
+  );
+};
+
+const EnableSmartTransactionsButton = ({
+  handleEnableButtonClick,
+}: {
+  handleEnableButtonClick: () => void;
+}) => {
+  const t = useI18nContext();
+  return (
+    <Button
+      marginTop={8}
+      variant={ButtonVariant.Primary}
+      onClick={handleEnableButtonClick}
+      width={BlockSize.Full}
+    >
+      {t('enable')}
+    </Button>
+  );
+};
+
+const NoThanksLink = ({
+  handleNoThanksLinkClick,
+}: {
+  handleNoThanksLinkClick: () => void;
+}) => {
+  const t = useI18nContext();
+  return (
+    <Button
+      marginTop={2}
+      type="link"
+      variant={ButtonVariant.Link}
+      color={TextColor.textAlternative}
+      onClick={handleNoThanksLinkClick}
+      width={BlockSize.Full}
+      className="mm-smart-transactions-opt-in-modal__no-thanks-link"
+    >
+      {t('noThanks')}
+    </Button>
+  );
+};
+
+const Description = () => {
+  const t = useI18nContext();
+  return (
+    <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
+      <Text variant={TextVariant.bodyMd} marginTop={4}>
+        {t('smartTransactionsDescription')}
+      </Text>
+      <Text variant={TextVariant.bodyMd} marginTop={4}>
+        {t('smartTransactionsDescription2', [<LearnMoreLink />])}
+      </Text>
+    </Box>
+  );
+};
+
+const Benefit = ({ text, iconName }: { text: string; iconName: IconName }) => {
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      className="mm-smart-transactions-opt-in-modal__benefit"
+      textAlign={TextAlign.Center}
+      alignItems={AlignItems.center}
+      justifyContent={JustifyContent.flexStart}
+    >
+      <Icon
+        name={iconName}
+        color={IconColor.primaryDefault}
+        className="mm-smart-transactions-opt-in-modal__icon"
+      />
+      <Text
+        variant={TextVariant.bodySm}
+        fontWeight={FontWeight.Medium}
+        marginTop={1}
+      >
+        {text}
+      </Text>
+    </Box>
+  );
+};
+
+const Benefits = () => {
+  const t = useI18nContext();
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Row}
+      justifyContent={JustifyContent.center}
+      marginTop={4}
+      paddingLeft={5}
+      paddingRight={5}
+    >
+      <Benefit
+        text={t('smartTransactionsBenefit1')}
+        iconName={IconName.Confirmation}
+      />
+      <Benefit
+        text={t('smartTransactionsBenefit2')}
+        iconName={IconName.SecurityTick}
+      />
+      <Benefit
+        text={t('smartTransactionsBenefit3')}
+        iconName={IconName.Clock}
+      />
+    </Box>
+  );
+};
+
+export default function SmartTransactionsOptInModal({
+  isOpen,
+  hideWhatsNewPopup,
+}: SmartTransactionsOptInModalProps) {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+
+  const handleEnableButtonClick = useCallback(() => {
+    dispatch(setSmartTransactionsOptInStatus(true));
+  }, [dispatch]);
+
+  const handleNoThanksLinkClick = useCallback(() => {
+    dispatch(setSmartTransactionsOptInStatus(false));
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (!isOpen) {
+      return;
+    }
+    // If the Smart Transactions Opt-In modal is open, hide the What's New popup,
+    // because we don't want to show 2 modals at the same time.
+    hideWhatsNewPopup();
+  }, [isOpen, hideWhatsNewPopup]);
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={handleEnableButtonClick}
+      isClosedOnOutsideClick={false}
+      isClosedOnEscapeKey={false}
+      className="mm-modal__custom-scrollbar mm-smart-transactions-opt-in-modal"
+      autoFocus={false}
+    >
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader
+          alignItems={AlignItems.center}
+          justifyContent={JustifyContent.center}
+        >
+          {t('smartTransactionsOptItModalTitle')}
+        </ModalHeader>
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          paddingLeft={4}
+          paddingRight={4}
+        >
+          <Benefits />
+          <Description />
+          <EnableSmartTransactionsButton
+            handleEnableButtonClick={handleEnableButtonClick}
+          />
+          <NoThanksLink handleNoThanksLinkClick={handleNoThanksLinkClick} />
+        </Box>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx
index df696916274a..2c00fa1861ec 100644
--- a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx
+++ b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { waitFor, fireEvent } from '@testing-library/react';
 import configureMockStore from 'redux-mock-store';
 import { Snap } from '@metamask/snaps-utils';
+import userEvent from '@testing-library/user-event';
 import mockStore from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/jest';
 import { toChecksumHexAddress } from '../../../../../shared/modules/hexstring-utils';
@@ -40,6 +41,8 @@ const defaultArgs = {
 };
 
 describe('Keyring Snap Remove Warning', () => {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let store: any;
   beforeAll(() => {
     store = configureMockStore()(mockStore);
@@ -101,6 +104,26 @@ describe('Keyring Snap Remove Warning', () => {
     });
   });
 
+  it('prevents pasting of the snap name to remove the snap', async () => {
+    const { getByText, getByTestId } = renderWithProvider(
+      <KeyringSnapRemovalWarning {...defaultArgs} />,
+      store,
+    );
+
+    const nextButton = getByText('Continue');
+
+    fireEvent.click(nextButton);
+    const confirmationInput = getByTestId('remove-snap-confirmation-input');
+
+    confirmationInput.focus();
+
+    await userEvent.paste(mockSnap.manifest?.proposedName);
+
+    await waitFor(() => {
+      expect(confirmationInput).toHaveValue('');
+    });
+  });
+
   it('opens block explorer for account', async () => {
     global.platform = { openTab: jest.fn(), closeCurrentWindow: jest.fn() };
     const { getByText, getAllByTestId } = renderWithProvider(
diff --git a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx
index 77aa8f1dab9d..d2a7335178bc 100644
--- a/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx
+++ b/ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.tsx
@@ -152,6 +152,9 @@ export default function KeyringRemovalSnapWarning({
                       validateConfirmationInput(e.target.value),
                     );
                   }}
+                  onPaste={(e: React.ClipboardEvent<HTMLInputElement>) => {
+                    e.preventDefault();
+                  }}
                   error={error}
                   inputProps={{
                     'data-testid': 'remove-snap-confirmation-input',
diff --git a/ui/components/app/snaps/snap-avatar/snap-avatar.js b/ui/components/app/snaps/snap-avatar/snap-avatar.js
index 9de191bb42b4..9d3e58c5f630 100644
--- a/ui/components/app/snaps/snap-avatar/snap-avatar.js
+++ b/ui/components/app/snaps/snap-avatar/snap-avatar.js
@@ -23,6 +23,7 @@ import {
   getSnapMetadata,
   getTargetSubjectMetadata,
 } from '../../../../selectors';
+import { getAvatarFallbackLetter } from '../../../../helpers/utils/util';
 
 const SnapAvatar = ({
   snapId,
@@ -42,7 +43,7 @@ const SnapAvatar = ({
   const iconUrl = subjectMetadata?.iconUrl;
 
   // We choose the first non-symbol char as the fallback icon.
-  const fallbackIcon = snapName?.match(/[a-z0-9]/iu)?.[0] ?? '?';
+  const fallbackIcon = getAvatarFallbackLetter(snapName);
 
   return (
     <BadgeWrapper
diff --git a/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js b/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js
index 4a6e155f0052..ede8bc796a46 100644
--- a/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js
+++ b/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js
@@ -1,18 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
-import Box from '../../../ui/box';
 import {
   IconColor,
   AlignItems,
   Display,
   FontWeight,
+  TextVariant,
 } from '../../../../helpers/constants/design-system';
 import {
+  Box,
   Icon,
   IconName,
   IconSize,
-  ValidTag,
   Text,
 } from '../../../component-library';
 import Tooltip from '../../../ui/tooltip/tooltip';
@@ -28,16 +28,20 @@ export default function SnapConnectCell({ origin, snapId }) {
 
   return (
     <Box
+      display={Display.Flex}
       alignItems={AlignItems.center}
       paddingTop={2}
       paddingBottom={2}
-      display={Display.Flex}
     >
       <SnapAvatar snapId={snapId} />
-      <Box width="full" marginLeft={4} marginRight={4}>
+      <Box width="full" paddingLeft={4} paddingRight={4}>
         <Text>
           {t('connectSnap', [
-            <Text as={ValidTag.Span} key="1" fontWeight={FontWeight.Bold}>
+            <Text
+              variant={TextVariant.inherit}
+              key="1"
+              fontWeight={FontWeight.Bold}
+            >
               {snapName}
             </Text>,
           ])}
diff --git a/ui/components/app/snaps/snap-insight/snap-insight.js b/ui/components/app/snaps/snap-insight/snap-insight.js
index 2f65756d648f..c13f3206f62e 100644
--- a/ui/components/app/snaps/snap-insight/snap-insight.js
+++ b/ui/components/app/snaps/snap-insight/snap-insight.js
@@ -19,35 +19,15 @@ import { SnapDelineator } from '../snap-delineator';
 import { DelineatorType } from '../../../../helpers/constants/snaps';
 import { Copyable } from '../copyable';
 import { getSnapMetadata } from '../../../../selectors';
-import {
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-  deleteInterface,
-  ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-  trackInsightSnapUsage,
-  ///: END:ONLY_INCLUDE_IF
-} from '../../../../store/actions';
-///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-import { useTransactionInsightSnaps } from '../../../../hooks/snaps/useTransactionInsightSnaps';
-///: END:ONLY_INCLUDE_IF
+import { trackInsightSnapUsage } from '../../../../store/actions';
 
-export const SnapInsight = ({
-  snapId,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-  data,
-  ///: END:ONLY_INCLUDE_IF
-  loading,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-  insightHookParams,
-  ///: END:ONLY_INCLUDE_IF
-}) => {
+export const SnapInsight = ({ snapId, data, loading }) => {
   const dispatch = useDispatch();
   const t = useI18nContext();
-  let error, interfaceId;
-  let isLoading = loading;
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-  error = data?.error;
-  interfaceId = data?.response?.id;
+  const isLoading = loading;
+  const error = data?.error;
+  const interfaceId = data?.response?.id;
+
   useEffect(() => {
     const trackInsightUsage = async () => {
       try {
@@ -58,20 +38,6 @@ export const SnapInsight = ({
     };
     trackInsightUsage();
   }, [snapId, dispatch]);
-  ///: END:ONLY_INCLUDE_IF
-
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-  const insights = useTransactionInsightSnaps(insightHookParams);
-  error = insights.data?.[0]?.error;
-  interfaceId = insights.data?.[0]?.response?.id;
-  isLoading = insights.loading;
-
-  useEffect(() => {
-    return () => {
-      interfaceId && dispatch(deleteInterface(interfaceId));
-    };
-  }, [interfaceId]);
-  ///: END:ONLY_INCLUDE_IF
 
   const { name: snapName } = useSelector((state) =>
     getSnapMetadata(state, snapId),
@@ -131,21 +97,16 @@ export const SnapInsight = ({
 };
 
 SnapInsight.propTypes = {
+  /**
+   * The snap id
+   */
   snapId: PropTypes.string,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   /*
    * The insight object
    */
   data: PropTypes.object,
-  ///: END:ONLY_INCLUDE_IF
   /*
    * Boolean as to whether or not the insights are loading
    */
   loading: PropTypes.bool,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-  /**
-   * Params object for the useTransactionInsightSnaps hook
-   */
-  insightHookParams: PropTypes.object,
-  ///: END:ONLY_INCLUDE_IF
 };
diff --git a/ui/components/app/snaps/snap-install-warning/snap-install-warning.js b/ui/components/app/snaps/snap-install-warning/snap-install-warning.js
index 6278c16c1014..b60979c43eac 100644
--- a/ui/components/app/snaps/snap-install-warning/snap-install-warning.js
+++ b/ui/components/app/snaps/snap-install-warning/snap-install-warning.js
@@ -263,7 +263,11 @@ export default function SnapInstallWarning({
         </ModalBody>
         <ModalFooter
           onSubmit={onConfirm}
-          submitButtonProps={{ children: t('confirm'), disabled: !userAgree }}
+          submitButtonProps={{
+            children: t('confirm'),
+            disabled: !userAgree,
+            'data-testid': 'snap-install-warning-modal-confirm',
+          }}
         />
       </ModalContent>
     </Modal>
diff --git a/ui/components/app/snaps/snap-permissions-list/snap-permissions-list.js b/ui/components/app/snaps/snap-permissions-list/snap-permissions-list.js
index 8465cb0cd8c1..0accd6612a57 100644
--- a/ui/components/app/snaps/snap-permissions-list/snap-permissions-list.js
+++ b/ui/components/app/snaps/snap-permissions-list/snap-permissions-list.js
@@ -18,7 +18,7 @@ export default function SnapPermissionsList({
   const snapsMetadata = useSelector(getSnapsMetadata);
 
   return (
-    <Box paddingTop={2} paddingBottom={2} className="snap-permissions-list">
+    <Box className="snap-permissions-list">
       {getWeightedPermissions({
         t,
         permissions,
diff --git a/ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx b/ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx
index ee5773f05ccd..29c28b56a564 100644
--- a/ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx
+++ b/ui/components/app/snaps/snap-ui-image/snap-ui-image.tsx
@@ -7,5 +7,5 @@ export type SnapUIImageProps = {
 export const SnapUIImage = ({ value }: SnapUIImageProps) => {
   const src = `data:image/svg+xml;utf8,${encodeURIComponent(value)}`;
 
-  return <img src={src} />;
+  return <img data-testid="snaps-ui-image" src={src} />;
 };
diff --git a/ui/components/app/snaps/snap-ui-markdown/index.scss b/ui/components/app/snaps/snap-ui-markdown/index.scss
index 17cc5a212854..1e206c28151f 100644
--- a/ui/components/app/snaps/snap-ui-markdown/index.scss
+++ b/ui/components/app/snaps/snap-ui-markdown/index.scss
@@ -4,15 +4,4 @@
       font-style: revert;
     }
   }
-
-  &__link {
-    & > span:last-child {
-      margin-inline-start: 2px;
-    }
-
-    & .mm-icon--size-inherit {
-      // Fixes the icon misalignment in ButtonLink when using ButtonLinkSize.Inherit
-      top: 0.1em;
-    }
-  }
 }
diff --git a/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js b/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
index 35bbb8b1f2f0..41c3a61425b0 100644
--- a/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
+++ b/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
@@ -5,11 +5,14 @@ import {
   TextVariant,
   OverflowWrap,
   TextColor,
+  Display,
 } from '../../../../helpers/constants/design-system';
 import {
   ButtonLink,
   ButtonLinkSize,
+  Icon,
   IconName,
+  IconSize,
   Text,
 } from '../../../component-library';
 import SnapLinkWarning from '../snap-link-warning';
@@ -27,13 +30,15 @@ const Paragraph = (props) => (
 const Link = ({ onClick, children, ...rest }) => (
   <ButtonLink
     {...rest}
+    as="a"
     onClick={onClick}
     externalLink
     size={ButtonLinkSize.Inherit}
-    endIconName={IconName.Export}
+    display={Display.Inline}
     className="snap-ui-markdown__link"
   >
     {children}
+    <Icon name={IconName.Export} size={IconSize.Inherit} marginLeft={1} />
   </ButtonLink>
 );
 
diff --git a/ui/components/app/snaps/snap-ui-renderer/utils.ts b/ui/components/app/snaps/snap-ui-renderer/utils.ts
index 7e7d287efdd5..aef8873f09bc 100644
--- a/ui/components/app/snaps/snap-ui-renderer/utils.ts
+++ b/ui/components/app/snaps/snap-ui-renderer/utils.ts
@@ -57,6 +57,8 @@ export const mapToTemplate = (params: MapToTemplateParams) => {
   const { type } = params.element;
   const indexKey = generateKey(params.map, params.element);
   // @ts-expect-error This seems to be compatibility issue between superstruct and this repo.
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const mapped = COMPONENT_MAPPING[type](params as any);
   return { ...mapped, key: indexKey };
 };
diff --git a/ui/components/app/snaps/update-snap-permission-list/update-snap-permission-list.js b/ui/components/app/snaps/update-snap-permission-list/update-snap-permission-list.js
index 9c68c81f73eb..4b45bbd11ba2 100644
--- a/ui/components/app/snaps/update-snap-permission-list/update-snap-permission-list.js
+++ b/ui/components/app/snaps/update-snap-permission-list/update-snap-permission-list.js
@@ -24,7 +24,7 @@ export default function UpdateSnapPermissionList({
   const snapsNameGetter = getSnapName(snapsMetadata);
 
   return (
-    <Box paddingTop={1}>
+    <Box>
       {getWeightedPermissions({
         t,
         permissions: newPermissions,
diff --git a/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx b/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx
index c3f7ea1d2353..86f29680fa7d 100644
--- a/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx
+++ b/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx
@@ -60,6 +60,8 @@ export default function QuizContent({
           key={idx}
           size={btn.size}
           onClick={btn.onClick}
+          // TODO: Replace `any` with type
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           variant={btn.variant as any}
           width={BlockSize.Full}
           data-testid={btn['data-testid']}
diff --git a/ui/components/app/srp-quiz-modal/SRPQuiz/SRPQuiz.tsx b/ui/components/app/srp-quiz-modal/SRPQuiz/SRPQuiz.tsx
index abcd2c1281bb..860a24b70052 100644
--- a/ui/components/app/srp-quiz-modal/SRPQuiz/SRPQuiz.tsx
+++ b/ui/components/app/srp-quiz-modal/SRPQuiz/SRPQuiz.tsx
@@ -57,6 +57,8 @@ const openSupportArticle = (): void => {
   });
 };
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export default function SRPQuiz(props: any) {
   const [stage, setStage] = useState<QuizStage>(QuizStage.introduction);
 
diff --git a/ui/components/app/srp-quiz-modal/types.ts b/ui/components/app/srp-quiz-modal/types.ts
index c94526dee966..d8a304f74f0d 100644
--- a/ui/components/app/srp-quiz-modal/types.ts
+++ b/ui/components/app/srp-quiz-modal/types.ts
@@ -14,6 +14,8 @@ export type IQuizInformationProps = {
   /**
    * The icon to display in the modal should use <Icon /> component
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   icon?: any;
   /**
    * The image to display in the modal
diff --git a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap
index 9f7511f47da3..2f4a2558a8ae 100644
--- a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap
+++ b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap
@@ -53,20 +53,6 @@ exports[`Token Cell should match snapshot 1`] = `
             >
               TEST
             </span>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
-            data-testid="multichain-token-list-item-secondary-value"
-          >
-            5.00
-          </p>
-        </div>
-        <div
-          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
-        >
-          <div
-            class="mm-box mm-box--width-1/3"
-          >
             <p
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-alternative"
               data-testid="multichain-token-list-item-token-name"
@@ -75,9 +61,14 @@ exports[`Token Cell should match snapshot 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--width-2/3"
-            style="overflow: hidden;"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
           >
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
+              data-testid="multichain-token-list-item-secondary-value"
+            >
+              5.00
+            </p>
             <p
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-alternative"
               data-testid="multichain-token-list-item-value"
@@ -88,6 +79,9 @@ exports[`Token Cell should match snapshot 1`] = `
             </p>
           </div>
         </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
+        />
       </div>
     </a>
   </div>
diff --git a/ui/components/app/token-cell/token-cell.test.js b/ui/components/app/token-cell/token-cell.test.js
index f3ccd03fb27d..5a351cb3c79b 100644
--- a/ui/components/app/token-cell/token-cell.test.js
+++ b/ui/components/app/token-cell/token-cell.test.js
@@ -32,7 +32,6 @@ jest.mock('../../../hooks/useIsOriginalTokenSymbol', () => {
 describe('Token Cell', () => {
   const mockState = {
     metamask: {
-      selectedAddress: '0xAddress',
       contractExchangeRates: {
         '0xAnotherToken': 0.015,
       },
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown.component.js b/ui/components/app/transaction-breakdown/transaction-breakdown.component.js
index 6d4bfd3fa9eb..ebf2d932c20f 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown.component.js
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown.component.js
@@ -29,7 +29,6 @@ export default class TransactionBreakdown extends PureComponent {
     priorityFee: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     hexGasTotal: PropTypes.string,
     isEIP1559Transaction: PropTypes.bool,
-    isMultiLayerFeeNetwork: PropTypes.bool,
     l1HexGasTotal: PropTypes.string,
   };
 
@@ -55,7 +54,6 @@ export default class TransactionBreakdown extends PureComponent {
       priorityFee,
       hexGasTotal,
       isEIP1559Transaction,
-      isMultiLayerFeeNetwork,
       l1HexGasTotal,
     } = this.props;
     return (
@@ -81,7 +79,7 @@ export default class TransactionBreakdown extends PureComponent {
         </TransactionBreakdownRow>
         <TransactionBreakdownRow
           title={
-            isMultiLayerFeeNetwork
+            l1HexGasTotal
               ? t('transactionHistoryL2GasLimitLabel')
               : `${t('gasLimit')} (${t('units')})`
           }
@@ -136,7 +134,7 @@ export default class TransactionBreakdown extends PureComponent {
         {!isEIP1559Transaction && (
           <TransactionBreakdownRow
             title={
-              isMultiLayerFeeNetwork
+              l1HexGasTotal
                 ? t('transactionHistoryL2GasPriceLabel')
                 : t('advancedGasPriceTitle')
             }
@@ -198,7 +196,7 @@ export default class TransactionBreakdown extends PureComponent {
             )}
           </TransactionBreakdownRow>
         )}
-        {isMultiLayerFeeNetwork && (
+        {l1HexGasTotal && (
           <TransactionBreakdownRow title={t('transactionHistoryL1GasLabel')}>
             <UserPreferencedCurrencyDisplay
               className="transaction-breakdown__value"
@@ -221,7 +219,7 @@ export default class TransactionBreakdown extends PureComponent {
             className="transaction-breakdown__value transaction-breakdown__value--eth-total"
             type={PRIMARY}
             value={totalInHex}
-            numberOfDecimals={isMultiLayerFeeNetwork ? 18 : null}
+            numberOfDecimals={l1HexGasTotal ? 18 : null}
           />
           {showFiat && (
             <UserPreferencedCurrencyDisplay
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown.container.js b/ui/components/app/transaction-breakdown/transaction-breakdown.container.js
index ed70719ba42e..45b6cc52b818 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown.container.js
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown.container.js
@@ -1,8 +1,5 @@
 import { connect } from 'react-redux';
-import {
-  getShouldShowFiat,
-  getIsMultiLayerFeeNetwork,
-} from '../../../selectors';
+import { getShouldShowFiat } from '../../../selectors';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import { getHexGasTotal } from '../../../helpers/utils/confirm-tx.util';
 import { isEIP1559Transaction } from '../../../../shared/modules/transaction.utils';
@@ -40,14 +37,7 @@ const mapStateToProps = (state, ownProps) => {
       getHexGasTotal({ gasLimit, gasPrice: usedGasPrice })) ||
     '0x0';
 
-  let totalInHex = sumHexes(hexGasTotal, value);
-
-  const isMultiLayerFeeNetwork =
-    getIsMultiLayerFeeNetwork(state) && l1HexGasTotal !== undefined;
-
-  if (isMultiLayerFeeNetwork) {
-    totalInHex = sumHexes(totalInHex, l1HexGasTotal);
-  }
+  const totalInHex = sumHexes(hexGasTotal, value, l1HexGasTotal ?? 0);
 
   return {
     nativeCurrency: getNativeCurrency(state),
@@ -62,7 +52,6 @@ const mapStateToProps = (state, ownProps) => {
     priorityFee,
     baseFee: baseFeePerGas,
     isEIP1559Transaction: isEIP1559Transaction(transaction),
-    isMultiLayerFeeNetwork,
     l1HexGasTotal,
   };
 };
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 e2fe8769b969..751b0f53e73a 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,8 +12,9 @@ import Button from '../../ui/button';
 import Tooltip from '../../ui/tooltip';
 import CancelButton from '../cancel-button';
 import Popover from '../../ui/popover';
+import { Box } from '../../component-library/box';
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-import { Box, Icon, IconName, Text } from '../../component-library';
+import { Icon, IconName, Text } from '../../component-library';
 import { IconColor } from '../../../helpers/constants/design-system';
 ///: END:ONLY_INCLUDE_IF
 import { SECOND } from '../../../../shared/constants/time';
@@ -380,19 +381,21 @@ export default class TransactionListItemDetails extends PureComponent {
               }
               {transactionGroup.initialTransaction.type !==
                 TransactionType.incoming && (
-                <Disclosure
-                  title={t('activityLog')}
-                  size="small"
-                  isScrollToBottomOnOpen
-                >
-                  <TransactionActivityLog
-                    transactionGroup={transactionGroup}
-                    className="transaction-list-item-details__transaction-activity-log"
-                    onCancel={this.handleCancel}
-                    onRetry={this.handleRetry}
-                    isEarliestNonce={isEarliestNonce}
-                  />
-                </Disclosure>
+                <Box marginTop={3} marginBottom={3}>
+                  <Disclosure
+                    title={t('activityLog')}
+                    size="small"
+                    isScrollToBottomOnOpen
+                  >
+                    <TransactionActivityLog
+                      transactionGroup={transactionGroup}
+                      className="transaction-list-item-details__transaction-activity-log"
+                      onCancel={this.handleCancel}
+                      onRetry={this.handleRetry}
+                      isEarliestNonce={isEarliestNonce}
+                    />
+                  </Disclosure>
+                </Box>
               )}
             </div>
           </div>
diff --git a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
index 206fa0ec30a1..d339d01f6fa1 100644
--- a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
@@ -3,11 +3,9 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import TransactionStatusLabel from '../transaction-status-label/transaction-status-label';
 import TransactionIcon from '../transaction-icon';
-import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useTransactionDisplayData } from '../../../hooks/useTransactionDisplayData';
 import { formatDateWithYearContext } from '../../../helpers/utils/util';
 import {
-  TransactionGroupCategory,
   TransactionGroupStatus,
   SmartTransactionStatus,
 } from '../../../../shared/constants/transaction';
@@ -35,20 +33,19 @@ export default function SmartTransactionListItem({
   isEarliestNonce = false,
 }) {
   const dispatch = useDispatch();
-  const t = useI18nContext();
   const [cancelSwapLinkClicked, setCancelSwapLinkClicked] = useState(false);
   const [showDetails, setShowDetails] = useState(false);
-  const { primaryCurrency, recipientAddress, isPending, senderAddress } =
-    useTransactionDisplayData(transactionGroup);
+  const {
+    title,
+    category,
+    primaryCurrency,
+    recipientAddress,
+    isPending,
+    senderAddress,
+  } = useTransactionDisplayData(transactionGroup);
   const currentChain = useSelector(getCurrentNetwork);
 
-  const { sourceTokenSymbol, destinationTokenSymbol, time, status } =
-    smartTransaction;
-  const category = TransactionGroupCategory.swap;
-  const title = t('swapTokenToToken', [
-    sourceTokenSymbol,
-    destinationTokenSymbol,
-  ]);
+  const { time, status } = smartTransaction;
   const date = formatDateWithYearContext(time, 'MMM d, y', 'MMM d');
   let displayedStatusKey;
   if (status === SmartTransactionStatus.pending) {
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 3d4b0c00a0b7..210f6809955e 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
@@ -65,6 +65,7 @@ import EditGasPopover from '../../../pages/confirmations/components/edit-gas-pop
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ActivityListItem } from '../../multichain';
 import { abortTransactionSigning } from '../../../store/actions';
+import { getIsSmartTransaction } from '../../../../shared/modules/selectors';
 
 function TransactionListItemInner({
   transactionGroup,
@@ -81,6 +82,7 @@ function TransactionListItemInner({
   const { supportsEIP1559 } = useGasFeeContext();
   const { openModal } = useTransactionModalContext();
   const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
+  const isSmartTransaction = useSelector(getIsSmartTransaction);
   const dispatch = useDispatch();
 
   const {
@@ -402,7 +404,8 @@ function TransactionListItemInner({
             !isCustodian &&
             ///: END:ONLY_INCLUDE_IF
             status === TransactionStatus.failed &&
-            !isSwap
+            !isSwap &&
+            !isSmartTransaction
           }
           showSpeedUp={
             ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.stories.js b/ui/components/app/transaction-list-item/transaction-list-item.stories.js
index f3f3ec157369..ef4b0567fc27 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.stories.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.stories.js
@@ -156,13 +156,6 @@ SimpleSend.args = {
   },
 };
 
-Smart.storyName = 'smart';
-Smart.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TransactionType.smart],
-  },
-};
-
 Swap.storyName = 'swap';
 Swap.args = {
   'transactionGroup.primaryTransaction': {
diff --git a/ui/components/app/transaction-list/transaction-list.component.js b/ui/components/app/transaction-list/transaction-list.component.js
index e8719969ea44..298d8dcba44b 100644
--- a/ui/components/app/transaction-list/transaction-list.component.js
+++ b/ui/components/app/transaction-list/transaction-list.component.js
@@ -6,7 +6,14 @@ import {
   nonceSortedCompletedTransactionsSelector,
   nonceSortedPendingTransactionsSelector,
 } from '../../../selectors/transactions';
-import { getCurrentChainId, getSelectedAccount } from '../../../selectors';
+import {
+  getCurrentChainId,
+  getSelectedAccount,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  getIsBuyableChain,
+  getShouldHideZeroBalanceTokens,
+  ///: END:ONLY_INCLUDE_IF
+} from '../../../selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import TransactionListItem from '../transaction-list-item';
 import SmartTransactionListItem from '../transaction-list-item/smart-transaction-list-item.component';
@@ -20,6 +27,13 @@ import {
   TextVariant,
 } from '../../../helpers/constants/design-system';
 import { formatDateWithYearContext } from '../../../helpers/utils/util';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance';
+import {
+  RAMPS_CARD_VARIANT_TYPES,
+  RampsCard,
+} from '../../multichain/ramps-card/ramps-card';
+///: END:ONLY_INCLUDE_IF
 
 const PAGE_INCREMENT = 10;
 
@@ -114,6 +128,21 @@ export default function TransactionList({
   );
   const chainId = useSelector(getCurrentChainId);
   const { address: selectedAddress } = useSelector(getSelectedAccount);
+
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  const shouldHideZeroBalanceTokens = useSelector(
+    getShouldHideZeroBalanceTokens,
+  );
+  const { totalFiatBalance } = useAccountTotalFiatBalance(
+    selectedAddress,
+    shouldHideZeroBalanceTokens,
+  );
+  const balanceIsZero = Number(totalFiatBalance) === 0;
+  const isBuyableChain = useSelector(getIsBuyableChain);
+
+  const showRampsCard = isBuyableChain && balanceIsZero;
+  ///: END:ONLY_INCLUDE_IF
+
   const renderDateStamp = (index, dateGroup) => {
     return index === 0 ? (
       <Text
@@ -205,98 +234,108 @@ export default function TransactionList({
     dateGroup.transactionGroups.length > 0;
 
   return (
-    <Box className="transaction-list" paddingTop={4}>
-      <Box className="transaction-list__transactions">
-        {pendingTransactions.length > 0 && (
-          <Box className="transaction-list__pending-transactions">
-            {pendingTransactions.map((dateGroup) => {
-              return dateGroup.transactionGroups.map(
-                (transactionGroup, index) => {
-                  if (
-                    transactionGroup.initialTransaction.transactionType ===
-                    TransactionType.smart
-                  ) {
-                    return (
-                      <Fragment key={`${transactionGroup.nonce}:${index}`}>
-                        {renderDateStamp(index, dateGroup)}
-                        <SmartTransactionListItem
-                          isEarliestNonce={index === 0}
-                          smartTransaction={transactionGroup.initialTransaction}
-                          transactionGroup={transactionGroup}
-                        />
-                      </Fragment>
-                    );
-                  }
-                  return (
-                    <Fragment key={`${transactionGroup.nonce}:${index}`}>
-                      {renderDateStamp(index, dateGroup)}
-                      <TransactionListItem
-                        isEarliestNonce={index === 0}
-                        transactionGroup={transactionGroup}
-                      />
-                    </Fragment>
-                  );
-                },
-              );
-            })}
-          </Box>
-        )}
-        <Box className="transaction-list__completed-transactions">
-          {completedTransactions.length > 0 ? (
-            completedTransactions
-              .map(removeIncomingTxsButToAnotherAddress)
-              .map(removeTxGroupsWithNoTx)
-              .filter(dateGroupsWithTransactionGroups)
-              .slice(0, limit)
-              .map((dateGroup) => {
+    <>
+      {
+        ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+        showRampsCard ? (
+          <RampsCard variant={RAMPS_CARD_VARIANT_TYPES.ACTIVITY} />
+        ) : null
+        ///: END:ONLY_INCLUDE_IF
+      }
+      <Box className="transaction-list" paddingTop={4}>
+        <Box className="transaction-list__transactions">
+          {pendingTransactions.length > 0 && (
+            <Box className="transaction-list__pending-transactions">
+              {pendingTransactions.map((dateGroup) => {
                 return dateGroup.transactionGroups.map(
                   (transactionGroup, index) => {
-                    return (
-                      <Fragment
-                        key={`${transactionGroup.nonce}:${
-                          transactionGroup.initialTransaction
-                            ? index
-                            : limit + index - 10
-                        }`}
-                      >
-                        {renderDateStamp(index, dateGroup)}
-                        {transactionGroup.initialTransaction
-                          ?.transactionType === TransactionType.smart ? (
+                    if (
+                      transactionGroup.initialTransaction?.isSmartTransaction
+                    ) {
+                      return (
+                        <Fragment key={`${transactionGroup.nonce}:${index}`}>
+                          {renderDateStamp(index, dateGroup)}
                           <SmartTransactionListItem
-                            transactionGroup={transactionGroup}
+                            isEarliestNonce={index === 0}
                             smartTransaction={
                               transactionGroup.initialTransaction
                             }
-                          />
-                        ) : (
-                          <TransactionListItem
                             transactionGroup={transactionGroup}
                           />
-                        )}
+                        </Fragment>
+                      );
+                    }
+                    return (
+                      <Fragment key={`${transactionGroup.nonce}:${index}`}>
+                        {renderDateStamp(index, dateGroup)}
+                        <TransactionListItem
+                          isEarliestNonce={index === 0}
+                          transactionGroup={transactionGroup}
+                        />
                       </Fragment>
                     );
                   },
                 );
-              })
-          ) : (
-            <Box className="transaction-list__empty">
-              <Box className="transaction-list__empty-text">
-                {t('noTransactions')}
-              </Box>
+              })}
             </Box>
           )}
-          {completedTransactions.length > limit && (
-            <Button
-              className="transaction-list__view-more"
-              type="secondary"
-              onClick={viewMore}
-            >
-              {t('viewMore')}
-            </Button>
-          )}
+          <Box className="transaction-list__completed-transactions">
+            {completedTransactions.length > 0 ? (
+              completedTransactions
+                .map(removeIncomingTxsButToAnotherAddress)
+                .map(removeTxGroupsWithNoTx)
+                .filter(dateGroupsWithTransactionGroups)
+                .slice(0, limit)
+                .map((dateGroup) => {
+                  return dateGroup.transactionGroups.map(
+                    (transactionGroup, index) => {
+                      return (
+                        <Fragment
+                          key={`${transactionGroup.nonce}:${
+                            transactionGroup.initialTransaction
+                              ? index
+                              : limit + index - 10
+                          }`}
+                        >
+                          {renderDateStamp(index, dateGroup)}
+                          {transactionGroup.initialTransaction
+                            ?.isSmartTransaction ? (
+                            <SmartTransactionListItem
+                              transactionGroup={transactionGroup}
+                              smartTransaction={
+                                transactionGroup.initialTransaction
+                              }
+                            />
+                          ) : (
+                            <TransactionListItem
+                              transactionGroup={transactionGroup}
+                            />
+                          )}
+                        </Fragment>
+                      );
+                    },
+                  );
+                })
+            ) : (
+              <Box className="transaction-list__empty">
+                <Box className="transaction-list__empty-text">
+                  {t('noTransactions')}
+                </Box>
+              </Box>
+            )}
+            {completedTransactions.length > limit && (
+              <Button
+                className="transaction-list__view-more"
+                type="secondary"
+                onClick={viewMore}
+              >
+                {t('viewMore')}
+              </Button>
+            )}
+          </Box>
         </Box>
       </Box>
-    </Box>
+    </>
   );
 }
 
diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index abd5351ed712..231057beb171 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -34,6 +34,7 @@ import {
   getPreferences,
   getSelectedInternalAccount,
   getSelectedAccountCachedBalance,
+  getUseExternalServices,
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   getSwapsDefaultToken,
   getCurrentKeyring,
@@ -87,15 +88,17 @@ const EthOverview = ({ className, showAddress }) => {
   const showFiat = useSelector(getShouldShowFiat);
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
   const chainId = useSelector(getCurrentChainId);
-  const { ticker, type } = useSelector(getProviderConfig);
+  const { ticker, type, rpcUrl } = useSelector(getProviderConfig);
   const balance = useSelector(getSelectedAccountCachedBalance);
   const isOriginalNativeSymbol = useIsOriginalNativeTokenSymbol(
     chainId,
     ticker,
     type,
+    rpcUrl,
   );
 
   const account = useSelector(getSelectedInternalAccount);
+  const isExternalServicesEnabled = useSelector(getUseExternalServices);
   const isSwapsChain = useSelector(getIsSwapsChain);
   const isSigningEnabled =
     account.methods.includes(EthMethod.SignTransaction) ||
@@ -323,7 +326,9 @@ const EthOverview = ({ className, showAddress }) => {
           />
           <IconButton
             className="eth-overview__button"
-            disabled={!isSwapsChain || !isSigningEnabled}
+            disabled={
+              !isSwapsChain || !isSigningEnabled || !isExternalServicesEnabled
+            }
             Icon={
               <Icon
                 name={IconName.SwapHorizontal}
diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
index ed5612b8cf4c..a17ee3cc499d 100644
--- a/ui/components/app/wallet-overview/eth-overview.test.js
+++ b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -73,6 +73,7 @@ describe('EthOverview', () => {
       preferences: {
         useNativeCurrencyAsPrimaryCurrency: true,
       },
+      useExternalServices: true,
       useCurrencyRateCheck: true,
       currentCurrency: 'usd',
       currencyRates: {
@@ -80,18 +81,12 @@ describe('EthOverview', () => {
           conversionRate: 2,
         },
       },
-      identities: {
-        '0x1': {
-          address: '0x1',
-        },
-      },
       accounts: {
         '0x1': {
           address: '0x1',
           balance: '0x1F4',
         },
       },
-      selectedAddress: '0x1',
       internalAccounts: {
         accounts: {
           'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
diff --git a/ui/components/app/wallet-overview/token-overview.test.js b/ui/components/app/wallet-overview/token-overview.test.js
index 45d70265e3fc..d852a58a9b7c 100644
--- a/ui/components/app/wallet-overview/token-overview.test.js
+++ b/ui/components/app/wallet-overview/token-overview.test.js
@@ -37,12 +37,6 @@ describe('TokenOverview', () => {
       preferences: {
         useNativeCurrencyAsPrimaryCurrency: true,
       },
-      identities: {
-        '0x1': {
-          address: '0x1',
-        },
-      },
-      selectedAddress: '0x1',
       internalAccounts: {
         accounts: {
           'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
diff --git a/ui/components/component-library/box/box.test.tsx b/ui/components/component-library/box/box.test.tsx
index 95774579fce7..7aa9125979df 100644
--- a/ui/components/component-library/box/box.test.tsx
+++ b/ui/components/component-library/box/box.test.tsx
@@ -2062,6 +2062,8 @@ describe('Box', () => {
         <Box margin={[0]}>1 item</Box>
         <Box margin={[0, 1]}>2 items</Box>
         <Box margin={[0, 1, 2]}>3 items</Box>
+        {/* TODO: Replace `any` with type */}
+        {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
         <Box margin={[0, 1, 2, 3, 4] as any}>too many items</Box>
       </>,
     );
diff --git a/ui/components/component-library/box/box.types.ts b/ui/components/component-library/box/box.types.ts
index 1999409ee2b2..50090859171c 100644
--- a/ui/components/component-library/box/box.types.ts
+++ b/ui/components/component-library/box/box.types.ts
@@ -84,6 +84,8 @@ export type StylePropValueType =
   | undefined;
 
 export type ClassNamesObject = {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [key: string]: any;
 };
 
diff --git a/ui/components/component-library/checkbox/__snapshots__/checkbox.test.tsx.snap b/ui/components/component-library/checkbox/__snapshots__/checkbox.test.tsx.snap
index 90c0f27f53b7..984c1fc79b3c 100644
--- a/ui/components/component-library/checkbox/__snapshots__/checkbox.test.tsx.snap
+++ b/ui/components/component-library/checkbox/__snapshots__/checkbox.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`Checkbox should render the Checkbox without crashing 1`] = `
       class="mm-checkbox__input-wrapper"
     >
       <input
-        class="mm-box mm-checkbox__input mm-box--margin-0 mm-box--margin-right-0 mm-box--display-flex mm-box--background-color-transparent mm-box--rounded-sm mm-box--border-color-border-default mm-box--border-width-2 box--border-style-solid"
+        class="mm-box mm-checkbox__input mm-box--margin-0 mm-box--margin-right-0 mm-box--display-flex mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-color-border-default mm-box--border-width-2 box--border-style-solid"
         type="checkbox"
       />
     </span>
diff --git a/ui/components/component-library/checkbox/checkbox.scss b/ui/components/component-library/checkbox/checkbox.scss
index bb77ce1d24e9..0e15a9eb9c2a 100644
--- a/ui/components/component-library/checkbox/checkbox.scss
+++ b/ui/components/component-library/checkbox/checkbox.scss
@@ -13,6 +13,7 @@
 
     &:hover:not(:disabled) {
       background-color: var(--color-background-default-hover);
+      cursor: pointer;
     }
 
     &:focus {
diff --git a/ui/components/component-library/checkbox/checkbox.tsx b/ui/components/component-library/checkbox/checkbox.tsx
index 235dc76ff843..ff6435e5d0b3 100644
--- a/ui/components/component-library/checkbox/checkbox.tsx
+++ b/ui/components/component-library/checkbox/checkbox.tsx
@@ -83,7 +83,7 @@ export const Checkbox: CheckboxComponent = React.forwardRef(
             backgroundColor={
               isChecked || isIndeterminate
                 ? BackgroundColor.primaryDefault
-                : BackgroundColor.transparent
+                : BackgroundColor.backgroundDefault
             }
             borderColor={
               isChecked || isIndeterminate
diff --git a/ui/components/component-library/checkbox/checkbox.types.ts b/ui/components/component-library/checkbox/checkbox.types.ts
index 451db8027044..a2765a7ba39e 100644
--- a/ui/components/component-library/checkbox/checkbox.types.ts
+++ b/ui/components/component-library/checkbox/checkbox.types.ts
@@ -51,10 +51,14 @@ export interface CheckboxStyleUtilityProps extends StyleUtilityProps {
   /*
    * label is the string or ReactNode to be rendered next to the Checkbox
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   label?: any;
   /*
    * Use inputProps for additional props to be spread to the checkbox input element
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   inputProps?: any; // TODO: Replace with Box types when the syntax and typing is properly figured out. Needs to accept everything Box accepts
   /*
    * Use inputRef to pass a ref to the html input element
diff --git a/ui/components/component-library/form-text-field/form-text-field.tsx b/ui/components/component-library/form-text-field/form-text-field.tsx
index af7225cce981..9ee7b534a179 100644
--- a/ui/components/component-library/form-text-field/form-text-field.tsx
+++ b/ui/components/component-library/form-text-field/form-text-field.tsx
@@ -70,6 +70,8 @@ export const FormTextField: FormTextFieldComponent = React.forwardRef(
         display={Display.Flex}
         flexDirection={FlexDirection.Column}
         ref={ref}
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         {...(props as BoxProps<any>)}
       >
         {label && (
diff --git a/ui/components/component-library/modal-content/modal-content.types.ts b/ui/components/component-library/modal-content/modal-content.types.ts
index f59faf351c8d..cf8a77ce6fac 100644
--- a/ui/components/component-library/modal-content/modal-content.types.ts
+++ b/ui/components/component-library/modal-content/modal-content.types.ts
@@ -43,6 +43,8 @@ export interface ModalContentStyleUtilityProps extends StyleUtilityProps {
   /**
    * Additional props to pass to the dialog node inside of ModalContent component
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   modalDialogProps?: any;
 }
 
diff --git a/ui/components/component-library/modal-focus/modal-focus.tsx b/ui/components/component-library/modal-focus/modal-focus.tsx
index f8152d527435..d310d4701064 100644
--- a/ui/components/component-library/modal-focus/modal-focus.tsx
+++ b/ui/components/component-library/modal-focus/modal-focus.tsx
@@ -8,6 +8,8 @@ import type { ModalFocusProps } from './modal-focus.types';
  */
 
 const FocusTrap: typeof ReactFocusLock =
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (ReactFocusLock as any).default ?? ReactFocusLock;
 
 export const ModalFocus: React.FC<ModalFocusProps> = ({
diff --git a/ui/components/component-library/select-button/select-button.types.ts b/ui/components/component-library/select-button/select-button.types.ts
index fdca7dbcd1ae..401544521a4f 100644
--- a/ui/components/component-library/select-button/select-button.types.ts
+++ b/ui/components/component-library/select-button/select-button.types.ts
@@ -34,6 +34,8 @@ export interface SelectButtonStyleUtilityProps extends StyleUtilityProps {
    *   endAccessory: <AvatarAccount address="0x5CfE73b6021E818B776b421B1c4Db2474086a7e1" size={AvatarAccountSize.Sm} />,
    * }
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   placeholder?: any;
   /*
    * Value for `SelectButton` component
@@ -45,6 +47,8 @@ export interface SelectButtonStyleUtilityProps extends StyleUtilityProps {
    *   endAccessory: <AvatarAccount address="0x5CfE73b6021E818B776b421B1c4Db2474086a7e1" size={AvatarAccountSize.Sm} />,
    * }
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value?: any;
   /*
    * DefaultValue for SelectButton component
@@ -56,6 +60,8 @@ export interface SelectButtonStyleUtilityProps extends StyleUtilityProps {
    *   endAccessory: <AvatarAccount address="0x5CfE73b6021E818B776b421B1c4Db2474086a7e1" size={AvatarAccountSize.Sm} />,
    * }
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   defaultValue?: any;
   /*
    * isBlock boolean prop for SelectButton component to set display to block
diff --git a/ui/components/component-library/select-option/select-option.types.ts b/ui/components/component-library/select-option/select-option.types.ts
index a56aeda06e72..14b367e060a1 100644
--- a/ui/components/component-library/select-option/select-option.types.ts
+++ b/ui/components/component-library/select-option/select-option.types.ts
@@ -13,10 +13,14 @@ export interface SelectOptionStyleUtilityProps extends StyleUtilityProps {
   /*
    * Children of the SelectOption component
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   children?: any;
   /*
    * The value of the SelectOption component
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value?: any;
 }
 
diff --git a/ui/components/component-library/select-wrapper/select-wrapper.tsx b/ui/components/component-library/select-wrapper/select-wrapper.tsx
index 1eae68f18b5f..054cdd032c69 100644
--- a/ui/components/component-library/select-wrapper/select-wrapper.tsx
+++ b/ui/components/component-library/select-wrapper/select-wrapper.tsx
@@ -29,6 +29,8 @@ export const SelectWrapper: SelectWrapperComponent = React.forwardRef(
     }: SelectWrapperProps<C>,
     ref?: PolymorphicRef<C>,
   ) => {
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const [uncontrolledValue, setUncontrolledValue] = useState<any | null>();
     const [isUncontrolledOpen, setIsUncontrolledOpen] =
       useState<boolean>(false);
diff --git a/ui/components/component-library/select-wrapper/select-wrapper.types.ts b/ui/components/component-library/select-wrapper/select-wrapper.types.ts
index 572b8192285e..eb6e0fb53b30 100644
--- a/ui/components/component-library/select-wrapper/select-wrapper.types.ts
+++ b/ui/components/component-library/select-wrapper/select-wrapper.types.ts
@@ -8,16 +8,30 @@ export type SelectContextType = {
   isOpen: boolean | undefined;
   onOpenChange: React.Dispatch<React.SetStateAction<boolean | undefined>>;
   isUncontrolledOpen: boolean;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   setIsUncontrolledOpen: React.Dispatch<React.SetStateAction<any | null>>;
   toggleUncontrolledOpen: () => void;
   isDanger?: boolean;
   isDisabled?: boolean;
   isMultiSelect?: boolean;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value: any | null;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onValueChange?: any;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   uncontrolledValue: any | null;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   setUncontrolledValue: React.Dispatch<React.SetStateAction<any | null>>;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   defaultValue: any | null;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   placeholder: any;
 };
 
@@ -36,21 +50,29 @@ export interface SelectWrapperStyleUtilityProps extends StyleUtilityProps {
    * Placeholder for SelectWrapper component to be displayed when no value or defaultValue is set.
    * Can be accessed within any component inside the SelectWrapper.
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   placeholder?: any;
   /**
    * Selected value of SelectWrapper component.
    * Can be accessed within any component inside the SelectWrapper.
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value?: any;
   /**
    * Default value of SelectWrapper component.
    * Can be accessed within any component inside the SelectWrapper.
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   defaultValue?: any;
   /**
    * Callback function that is called when the value of the SelectWrapper component changes.
    * The new value is passed as an argument to the function.
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onValueChange?: (newValue: any) => void;
   /**
    * isOpen boolean determines whether the SelectWrapper popover is open or closed.
@@ -67,6 +89,8 @@ export interface SelectWrapperStyleUtilityProps extends StyleUtilityProps {
   /**
    * onOpenChange callback function is called when the SelectWrapper popover is opened or closed.
    */
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onOpenChange?: any; // TO DO: confirm type
   /**
    * Callback function that is called when the SelectWrapper component loses focus.
@@ -78,7 +102,11 @@ export interface SelectWrapperStyleUtilityProps extends StyleUtilityProps {
    * SelectWrapper's popover will be anchored to this component.
    */
   triggerComponent: React.ReactElement<
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     string | React.JSXElementConstructor<any>
   > | null;
 
diff --git a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js
index 20c963cfc3bf..61b7700279df 100644
--- a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js
+++ b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.js
@@ -10,7 +10,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import withModalProps from '../../../helpers/higher-order-components/with-modal-props';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 import { mmiActionsFactory } from '../../../store/institutional/institution-background';
-import { setSelectedAddress } from '../../../store/actions';
+import { setSelectedInternalAccount } from '../../../store/actions';
 import { getInternalAccounts } from '../../../selectors';
 import {
   getMMIAddressFromModalOrAddress,
@@ -64,7 +64,7 @@ const CustodyConfirmLink = ({ hideModal }) => {
         .map((internalAccount) => internalAccount.address)
         .find((account) => ethereum.accounts.includes(account.toLowerCase()));
 
-      ethAccount && dispatch(setSelectedAddress(ethAccount.toLowerCase()));
+      ethAccount && dispatch(setSelectedInternalAccount(ethAccount.id));
     }
 
     trackEvent({
diff --git a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.stories.js b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.stories.js
index b735b9dd9e05..d8a20c2d06f5 100644
--- a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.stories.js
+++ b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.stories.js
@@ -55,7 +55,6 @@ const customData = {
     providerConfig: {
       type: 'test',
     },
-    selectedAddress: '0xAddress',
   },
 };
 
diff --git a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.test.js b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.test.js
index 35c21d0e376d..f33ae89650a4 100644
--- a/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.test.js
+++ b/ui/components/institutional/custody-confirm-link-modal/custody-confirm-link-modal.test.js
@@ -4,6 +4,7 @@ import configureStore from 'redux-mock-store';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import testData from '../../../../.storybook/test-data';
 import { hideModal } from '../../../store/actions';
+import { createMockInternalAccount } from '../../../../test/jest/mocks';
 import CustodyConfirmLink from '.';
 
 const mockedSetWaitForConfirmDeepLinkDialog = jest
@@ -22,6 +23,10 @@ jest.mock('../../../store/actions', () => ({
 const mockedCustodianName = 'saturn-dev';
 
 describe('Custody Confirm Link', () => {
+  const mockInternalAccount = createMockInternalAccount({
+    keyringType: 'Custody Test',
+    address: '0xAddress',
+  });
   const mockStore = {
     ...testData,
     appState: {
@@ -43,6 +48,12 @@ describe('Custody Confirm Link', () => {
     },
     metamask: {
       ...testData.metamask,
+      internalAccounts: {
+        accounts: {
+          [mockInternalAccount.id]: mockInternalAccount,
+        },
+        selectedAccount: mockInternalAccount.id,
+      },
       mmiConfiguration: {
         custodians: [
           {
@@ -73,7 +84,6 @@ describe('Custody Confirm Link', () => {
       providerConfig: {
         type: 'test',
       },
-      selectedAddress: '0xAddress',
     },
   };
 
diff --git a/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.stories.js b/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.stories.js
index 9ef1baac8817..dac449cce66a 100644
--- a/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.stories.js
+++ b/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.stories.js
@@ -45,7 +45,6 @@ const customData = {
     providerConfig: {
       type: 'test',
     },
-    selectedAddress: '0xAddress',
     isUnlocked: true,
     interactiveReplacementToken: {
       oldRefreshToken: 'abc',
diff --git a/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.test.js b/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.test.js
index a1ea9359e91b..276cc3d987b1 100644
--- a/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.test.js
+++ b/ui/components/institutional/interactive-replacement-token-modal/interactive-replacement-token-modal.test.js
@@ -46,7 +46,6 @@ describe('Interactive Replacement Token Modal', function () {
       providerConfig: {
         type: 'test',
       },
-      selectedAddress: '0xAddress',
       isUnlocked: true,
       interactiveReplacementToken: {
         oldRefreshToken: 'abc',
diff --git a/ui/components/institutional/interactive-replacement-token-notification/interactive-replacement-token-notification.stories.js b/ui/components/institutional/interactive-replacement-token-notification/interactive-replacement-token-notification.stories.js
index 33e750a8c491..363a9294528a 100644
--- a/ui/components/institutional/interactive-replacement-token-notification/interactive-replacement-token-notification.stories.js
+++ b/ui/components/institutional/interactive-replacement-token-notification/interactive-replacement-token-notification.stories.js
@@ -11,13 +11,6 @@ const customData = {
     providerConfig: {
       type: 'test',
     },
-    selectedAddress: '0xca8f1F0245530118D0cf14a06b01Daf8f76Cf281',
-    identities: {
-      '0xca8f1F0245530118D0cf14a06b01Daf8f76Cf281': {
-        address: '0xca8f1F0245530118D0cf14a06b01Daf8f76Cf281',
-        name: 'Custodian A',
-      },
-    },
     isUnlocked: true,
     interactiveReplacementToken: {
       oldRefreshToken:
diff --git a/ui/components/institutional/qr-code-modal/index.tsx b/ui/components/institutional/qr-code-modal/index.tsx
new file mode 100644
index 000000000000..a60a518f1e0b
--- /dev/null
+++ b/ui/components/institutional/qr-code-modal/index.tsx
@@ -0,0 +1 @@
+export { default } from './qr-code-modal';
diff --git a/ui/components/institutional/qr-code-modal/qr-code-modal.stories.tsx b/ui/components/institutional/qr-code-modal/qr-code-modal.stories.tsx
new file mode 100644
index 000000000000..aeb43e6a933c
--- /dev/null
+++ b/ui/components/institutional/qr-code-modal/qr-code-modal.stories.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { Meta, StoryFn } from '@storybook/react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import QRCodeModal from './qr-code-modal';
+
+const mockStore = configureMockStore();
+const testData = {
+  metamask: {
+    institutionalFeatures: {
+      channelId: 'channel123',
+      connectionRequest: {
+        payload: 'encryptedPayload',
+      },
+    },
+  },
+};
+
+const store = mockStore(testData);
+
+const meta: Meta<typeof QRCodeModal> = {
+  title: 'Components/QRCodeModal',
+  decorators: [
+    (storyFn: any) => <Provider store={store}>{storyFn()}</Provider>,
+  ],
+  component: QRCodeModal,
+  argTypes: {
+    onClose: { action: 'closed' },
+    custodianName: { control: 'text' },
+    custodianURL: { control: 'text' },
+  },
+};
+
+export default meta;
+
+const Template: StoryFn<typeof QRCodeModal> = (args) => (
+  <QRCodeModal {...args} />
+);
+
+export const Default = Template.bind({});
+Default.args = {
+  custodianName: 'Test Custodian',
+  custodianURL: 'http://testcustodian.com',
+};
+
+export const WithError = Template.bind({});
+WithError.args = {
+  ...Default.args,
+  error: 'Failed to load data',
+};
diff --git a/ui/components/institutional/qr-code-modal/qr-code-modal.test.tsx b/ui/components/institutional/qr-code-modal/qr-code-modal.test.tsx
new file mode 100644
index 000000000000..9f1a21e2230b
--- /dev/null
+++ b/ui/components/institutional/qr-code-modal/qr-code-modal.test.tsx
@@ -0,0 +1,171 @@
+import React from 'react';
+import { fireEvent, render, waitFor } from '@testing-library/react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import QRCodeModal from './qr-code-modal';
+
+const mockStore = configureMockStore([thunk]);
+
+const mockHandleClose = jest.fn();
+const props = {
+  onClose: mockHandleClose,
+  custodianName: 'Test Custodian',
+  custodianURL: 'http://testcustodian.com',
+  setQrConnectionRequest: jest.fn(),
+};
+
+describe('QRCodeModal', () => {
+  beforeEach(() => {
+    const mockCrypto = {
+      subtle: {
+        generateKey: jest.fn(() =>
+          Promise.resolve({
+            publicKey: { fake: 'publicKey' },
+            privateKey: { fake: 'privateKey' },
+          }),
+        ),
+        exportKey: jest.fn(() =>
+          Promise.resolve(new Uint8Array([1, 2, 3, 4]).buffer),
+        ),
+        decrypt: jest.fn(() =>
+          Promise.resolve(
+            new TextEncoder().encode(
+              JSON.stringify({ data: 'decrypted data' }),
+            ),
+          ),
+        ),
+      },
+    };
+
+    Object.defineProperty(window, 'crypto', {
+      value: mockCrypto,
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+  });
+
+  it('should display the QR code when qrCodeValue is set', async () => {
+    const store = mockStore({
+      metamask: {
+        institutionalFeatures: {
+          channelId: 'channel123',
+        },
+      },
+    });
+
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <QRCodeModal {...props} />
+      </Provider>,
+    );
+
+    await waitFor(() => {
+      expect(getByTestId('qr-code-visible')).toBeInTheDocument();
+    });
+  });
+
+  it('should process and display decrypted data correctly', async () => {
+    const store = mockStore({
+      metamask: {
+        institutionalFeatures: {
+          channelId: 'channel123',
+          connectionRequest: { payload: btoa('encrypted payload') },
+        },
+      },
+    });
+
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <QRCodeModal {...props} />
+      </Provider>,
+    );
+
+    await waitFor(() => {
+      expect(window.crypto.subtle.decrypt).toHaveBeenCalled();
+      expect(getByTestId('qr-code-visible')).toBeInTheDocument();
+    });
+  });
+
+  it('should call onClose when the close button is clicked', async () => {
+    const store = mockStore({
+      metamask: {
+        institutionalFeatures: {
+          channelId: 'channel123',
+        },
+      },
+    });
+
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <QRCodeModal {...props} />
+      </Provider>,
+    );
+    const closeButton = getByTestId('cancel-btn');
+
+    fireEvent.click(closeButton);
+
+    await waitFor(() => {
+      expect(mockHandleClose).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('displays an error message when decryption fails', async () => {
+    const initialState = {
+      metamask: {
+        institutionalFeatures: {
+          channelId: 'channel123',
+          connectionRequest: { payload: 'encrypted-payload' },
+        },
+      },
+    };
+    const localStore = mockStore(initialState);
+
+    jest
+      .spyOn(window.crypto.subtle, 'decrypt')
+      .mockImplementation(() => Promise.reject(new Error('Decryption failed')));
+
+    const { getByText } = render(
+      <Provider store={localStore}>
+        <QRCodeModal {...props} />
+      </Provider>,
+    );
+
+    await waitFor(() => {
+      expect(
+        getByText(/An error occurred while decrypting data/u),
+      ).toBeInTheDocument();
+    });
+  });
+
+  it('displays an error message when key generation fails', async () => {
+    const store = mockStore({
+      metamask: {
+        institutionalFeatures: {
+          channelId: 'channel123',
+        },
+      },
+    });
+
+    jest
+      .spyOn(window.crypto.subtle, 'generateKey')
+      .mockImplementation(() =>
+        Promise.reject(new Error('Key generation failed')),
+      );
+
+    const { getByText } = render(
+      <Provider store={store}>
+        <QRCodeModal {...props} />
+      </Provider>,
+    );
+
+    await waitFor(() => {
+      expect(
+        getByText(/An error occurred while generating cryptographic keys/u),
+      ).toBeInTheDocument();
+    });
+  });
+});
diff --git a/ui/components/institutional/qr-code-modal/qr-code-modal.tsx b/ui/components/institutional/qr-code-modal/qr-code-modal.tsx
new file mode 100644
index 000000000000..bf043cc83d8a
--- /dev/null
+++ b/ui/components/institutional/qr-code-modal/qr-code-modal.tsx
@@ -0,0 +1,264 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+// @ts-expect-error: No available type definitions for module 'qrcode.react'
+import QRCode from 'qrcode.react';
+import { v4 as uuid } from 'uuid';
+import { captureException } from '@sentry/browser';
+import {
+  Modal,
+  ModalOverlay,
+  Text,
+  Box,
+  ButtonLink,
+} from '../../component-library';
+import { ModalContent } from '../../component-library/modal-content/modal-content';
+import { ModalHeader } from '../../component-library/modal-header/modal-header';
+import {
+  TextAlign,
+  TextColor,
+  TextVariant,
+  FontWeight,
+} from '../../../helpers/constants/design-system';
+import Spinner from '../../ui/spinner';
+import {
+  getChannelId,
+  getConnectionRequest,
+} from '../../../ducks/institutional/institutional';
+import { mmiActionsFactory } from '../../../store/institutional/institution-background';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+type QRCodeModalProps = {
+  onClose: () => void;
+  custodianName?: string;
+  custodianURL: string;
+  setQrConnectionRequest: (message: string) => void;
+};
+
+const QRCodeModal: React.FC<QRCodeModalProps> = ({
+  onClose,
+  custodianName = 'custodian',
+  custodianURL,
+  setQrConnectionRequest,
+}) => {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const channelId = useSelector(getChannelId);
+  const connectionRequest = useSelector(getConnectionRequest);
+  const [publicKey, setPublicKey] = useState<string | null>(null);
+  const [privateKey, setPrivateKey] = useState<CryptoKey | null>(null);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const [decryptedMessage, setDecryptedMessage] = useState<any>(null);
+  const [qrCodeValue, setQrCodeValue] = useState<string | null>(null);
+  const [error, setError] = useState<string>('');
+  const [traceId] = useState<string>(uuid());
+  const mmiActions = mmiActionsFactory();
+
+  const handleClose = useCallback(async () => {
+    await dispatch(mmiActions.setConnectionRequest(null));
+    onClose();
+  }, [dispatch, mmiActions, onClose]);
+
+  const handleError = useCallback(
+    (message: string, e: Error) => {
+      const errorMessage = `${message} Please try again or contact support if the problem persists.`;
+      console.error(message, e);
+      setError(errorMessage);
+      captureException(e);
+    },
+    [setError],
+  );
+
+  const generateKeyPair = useCallback(async () => {
+    try {
+      const keyPair = await window.crypto.subtle.generateKey(
+        {
+          name: 'RSA-OAEP',
+          modulusLength: 4096,
+          publicExponent: new Uint8Array([1, 0, 1]),
+          hash: { name: 'SHA-256' },
+        },
+        true,
+        ['encrypt', 'decrypt'],
+      );
+
+      const exportedPublicKey = await window.crypto.subtle.exportKey(
+        'spki',
+        keyPair.publicKey,
+      );
+
+      setPublicKey(
+        btoa(
+          String.fromCharCode(...Array.from(new Uint8Array(exportedPublicKey))),
+        ),
+      );
+
+      setPrivateKey(keyPair.privateKey);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (e: any) {
+      handleError('An error occurred while generating cryptographic keys.', e);
+    }
+  }, [handleError]);
+
+  const decrypt = useCallback(
+    async (_privateKey: CryptoKey, encryptedData: string) => {
+      try {
+        const encryptedBuffer = Uint8Array.from(atob(encryptedData), (c) =>
+          c.charCodeAt(0),
+        );
+        const decrypted = await window.crypto.subtle.decrypt(
+          { name: 'RSA-OAEP' },
+          _privateKey,
+          encryptedBuffer,
+        );
+        const decryptedString = new TextDecoder().decode(decrypted);
+        return JSON.parse(decryptedString);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      } catch (e: any) {
+        handleError('An error occurred while decrypting data.', e);
+        throw e;
+      }
+    },
+    [handleError],
+  );
+
+  useEffect(() => {
+    generateKeyPair();
+  }, []);
+
+  useEffect(() => {
+    const decryptAndProcessData = async () => {
+      if (connectionRequest && privateKey) {
+        try {
+          const decryptedPayload = await decrypt(
+            privateKey,
+            connectionRequest.payload,
+          );
+
+          setDecryptedMessage(decryptedPayload);
+        } catch (e) {
+          // Error handling is managed by the decrypt function
+        }
+      }
+    };
+
+    decryptAndProcessData();
+  }, [connectionRequest, privateKey, decrypt]);
+
+  useEffect(() => {
+    if (publicKey && channelId) {
+      const value = JSON.stringify({
+        publicKey,
+        actionDescription: 'mmi:connect-request/qr-code?encrypted',
+        channelId,
+        traceId,
+      });
+
+      setQrCodeValue(value);
+    }
+  }, [publicKey, channelId, traceId]);
+
+  useEffect(() => {
+    const updateConnectRequests = async () => {
+      try {
+        setQrConnectionRequest(decryptedMessage);
+        handleClose();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      } catch (e: any) {
+        handleError('An error occurred while updating connection requests.', e);
+      }
+    };
+
+    if (decryptedMessage) {
+      updateConnectRequests();
+    }
+  }, [
+    decryptedMessage,
+    dispatch,
+    mmiActions,
+    handleClose,
+    handleError,
+    setQrConnectionRequest,
+  ]);
+
+  const custodianLink = (
+    <a
+      target="_blank"
+      key="custodianUrl"
+      rel="noopener noreferrer"
+      href={custodianURL}
+    >
+      <Text
+        as="span"
+        color={TextColor.primaryDefault}
+        variant={TextVariant.bodySm}
+      >
+        {custodianName}
+      </Text>
+    </a>
+  );
+
+  return (
+    <Modal isOpen onClose={handleClose}>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader onClose={handleClose}>
+          {t('connectCustodianAccounts', [custodianName])}
+        </ModalHeader>
+        {error && <Text color={TextColor.errorDefault}>{error}</Text>}
+        {qrCodeValue ? (
+          <Box
+            data-testid="qr-code-visible"
+            style={{
+              padding: 20,
+              backgroundColor: 'var(--qr-code-white-background)',
+              display: 'flex',
+              alignItems: 'center',
+              flexDirection: 'column',
+            }}
+          >
+            <QRCode value={qrCodeValue} size={270} />
+          </Box>
+        ) : (
+          <Spinner color="var(--color-warning-default)" />
+        )}
+        <Text
+          as="p"
+          paddingRight={10}
+          paddingLeft={10}
+          paddingBottom={4}
+          color={TextColor.textDefault}
+          textAlign={TextAlign.Center}
+          fontWeight={FontWeight.Bold}
+        >
+          {t('custodianQRCodeScan', [custodianName])}
+        </Text>
+        <Text
+          as="p"
+          paddingRight={10}
+          paddingLeft={10}
+          paddingBottom={4}
+          color={TextColor.textDefault}
+          variant={TextVariant.bodySm}
+          textAlign={TextAlign.Center}
+        >
+          {t('custodianQRCodeScanDescription', [custodianLink])}
+        </Text>
+        <ButtonLink
+          paddingRight={10}
+          paddingLeft={10}
+          paddingBottom={4}
+          variant={TextVariant.bodySm}
+          textAlign={TextAlign.Center}
+          color={TextColor.primaryDefault}
+          onClick={handleClose}
+          data-testid="cancel-btn"
+        >
+          {t('cancel')}
+        </ButtonLink>
+        <span className="hidden" data-value={qrCodeValue} />
+      </ModalContent>
+    </Modal>
+  );
+};
+
+export default QRCodeModal;
diff --git a/ui/components/institutional/wrong-network-notification/wrong-network-notification.stories.js b/ui/components/institutional/wrong-network-notification/wrong-network-notification.stories.js
index 3e4b0be7f079..979a7b9651b4 100644
--- a/ui/components/institutional/wrong-network-notification/wrong-network-notification.stories.js
+++ b/ui/components/institutional/wrong-network-notification/wrong-network-notification.stories.js
@@ -18,19 +18,12 @@ const customData = {
         '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275': { balance: '0x0' },
       },
     },
-    selectedAddress: '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275',
     custodianSupportedChains: {
       '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275': {
         supportedChains: ['1', '2'],
         custodianName: 'saturn',
       },
     },
-    identities: {
-      '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275': {
-        name: 'Custody Account A',
-        address: '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275',
-      },
-    },
     keyrings: [
       {
         type: 'Custody',
diff --git a/ui/components/institutional/wrong-network-notification/wrong-network-notification.test.js b/ui/components/institutional/wrong-network-notification/wrong-network-notification.test.js
index bcfc3d8be06f..9e01b8b2bd93 100644
--- a/ui/components/institutional/wrong-network-notification/wrong-network-notification.test.js
+++ b/ui/components/institutional/wrong-network-notification/wrong-network-notification.test.js
@@ -17,7 +17,6 @@ describe('Wrong Network Notification', function () {
         type: 'test',
         chainId: toHex(3),
       },
-      selectedAddress: '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275',
       accountsByChainId: {
         [toHex(1)]: {
           '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275': { balance: '0x0' },
@@ -29,12 +28,6 @@ describe('Wrong Network Notification', function () {
           custodianName: 'saturn',
         },
       },
-      identities: {
-        '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275': {
-          name: 'Custody Account A',
-          address: '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275',
-        },
-      },
       internalAccounts: {
         accounts: {
           'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
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 3c42c61cce52..3644ba6ecb67 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
@@ -12,7 +12,6 @@ import {
   getAccountTypeForKeyring,
   getPinnedAccountsList,
   getHiddenAccountsList,
-  getOriginOfCurrentTab,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   getMetaMaskAccountsOrdered,
   ///: END:ONLY_INCLUDE_IF
@@ -22,7 +21,6 @@ import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils
 ///: END:ONLY_INCLUDE_IF
 import { MenuItem } from '../../ui/menu';
 import {
-  Box,
   IconName,
   ModalFocus,
   Popover,
@@ -35,12 +33,11 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import {
-  addPermittedAccount,
   showModal,
   updateAccountsList,
   updateHiddenAccountsList,
 } from '../../../store/actions';
-import { Display, TextVariant } from '../../../helpers/constants/design-system';
+import { TextVariant } from '../../../helpers/constants/design-system';
 import { formatAccountType } from '../../../helpers/utils/metrics';
 import { AccountDetailsMenuItem, ViewExplorerMenuItem } from '..';
 
@@ -51,11 +48,10 @@ export const AccountListItemMenu = ({
   onClose,
   closeMenu,
   isRemovable,
-  identity,
+  account,
   isOpen,
   isPinned,
   isHidden,
-  isConnected,
 }) => {
   const t = useI18nContext();
   const trackEvent = useContext(MetaMetricsContext);
@@ -65,12 +61,11 @@ export const AccountListItemMenu = ({
 
   const deviceName = useSelector(getHardwareWalletType);
 
-  const { keyring } = identity.metadata;
+  const { keyring } = account.metadata;
   const accountType = formatAccountType(getAccountTypeForKeyring(keyring));
 
   const pinnedAccountList = useSelector(getPinnedAccountsList);
   const hiddenAccountList = useSelector(getHiddenAccountsList);
-  const shouldRenderConnectAccount = process.env.MULTICHAIN && !isConnected;
 
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const isCustodial = keyring?.type ? /Custody/u.test(keyring.type) : false;
@@ -161,8 +156,6 @@ export const AccountListItemMenu = ({
     dispatch(updateHiddenAccountsList(updatedHiddenAccountList));
   };
 
-  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
-
   return (
     <Popover
       className="multichain-account-list-item-menu__popover"
@@ -178,41 +171,25 @@ export const AccountListItemMenu = ({
     >
       <ModalFocus restoreFocus initialFocusRef={anchorElement}>
         <div onKeyDown={handleKeyDown} ref={popoverDialogRef}>
-          {shouldRenderConnectAccount ? (
-            <Box display={[Display.Flex, Display.None]}>
-              <MenuItem
-                data-testid="account-list-menu-connect-account"
-                onClick={() => {
-                  dispatch(
-                    addPermittedAccount(activeTabOrigin, identity.address),
-                  );
-                  onClose();
-                }}
-                iconName={IconName.UserCircleLink}
-              >
-                <Text variant={TextVariant.bodySm}>{t('connectAccount')}</Text>
-              </MenuItem>
-            </Box>
-          ) : null}
           <AccountDetailsMenuItem
             metricsLocation={METRICS_LOCATION}
             closeMenu={closeMenu}
-            address={identity.address}
+            address={account.address}
             textProps={{ variant: TextVariant.bodySm }}
           />
           <ViewExplorerMenuItem
             metricsLocation={METRICS_LOCATION}
             closeMenu={closeMenu}
             textProps={{ variant: TextVariant.bodySm }}
-            address={identity.address}
+            address={account.address}
           />
           {isHidden ? null : (
             <MenuItem
               data-testid="account-list-menu-pin"
               onClick={() => {
                 isPinned
-                  ? handleUnpinning(identity.address)
-                  : handlePinning(identity.address);
+                  ? handleUnpinning(account.address)
+                  : handlePinning(account.address);
                 onClose();
               }}
               iconName={isPinned ? IconName.Unpin : IconName.Pin}
@@ -226,8 +203,8 @@ export const AccountListItemMenu = ({
             data-testid="account-list-menu-hide"
             onClick={() => {
               isHidden
-                ? handleUnhidding(identity.address)
-                : handleHidding(identity.address);
+                ? handleUnhidding(account.address)
+                : handleHidding(account.address);
               onClose();
             }}
             iconName={isHidden ? IconName.Eye : IconName.EyeSlash}
@@ -244,7 +221,7 @@ export const AccountListItemMenu = ({
                 dispatch(
                   showModal({
                     name: 'CONFIRM_REMOVE_ACCOUNT',
-                    identity,
+                    account,
                   }),
                 );
                 trackEvent({
@@ -272,7 +249,7 @@ export const AccountListItemMenu = ({
                 data-testid="account-options-menu__remove-jwt"
                 onClick={async () => {
                   const token = await dispatch(
-                    mmiActions.getCustodianToken(identity.address),
+                    mmiActions.getCustodianToken(account.address),
                   );
 
                   const custodyAccountDetails = await dispatch(
@@ -288,7 +265,7 @@ export const AccountListItemMenu = ({
                       token,
                       custodyAccountDetails,
                       accounts,
-                      selectedAddress: toChecksumHexAddress(identity.address),
+                      selectedAddress: toChecksumHexAddress(account.address),
                     }),
                   );
                   onClose();
@@ -338,14 +315,10 @@ AccountListItemMenu.propTypes = {
    * Represents hidden accounts
    */
   isHidden: PropTypes.bool,
-  /**
-   * Represents connected status
-   */
-  isConnected: PropTypes.bool,
   /**
    * An account object that has name, address, and balance data
    */
-  identity: PropTypes.shape({
+  account: PropTypes.shape({
     id: PropTypes.string.isRequired,
     address: PropTypes.string.isRequired,
     balance: PropTypes.string.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
index 045a174e2f95..dda7fd811e18 100644
--- 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
@@ -17,7 +17,7 @@ export default {
     isRemovable: {
       control: 'boolean',
     },
-    identity: {
+    account: {
       control: 'object',
     },
     isOpen: {
@@ -26,7 +26,7 @@ export default {
   },
   args: {
     anchorElement: null,
-    identity: {
+    account: {
       address: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
       id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
       metadata: {
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
index f874f0b82068..7109510ae2a6 100644
--- 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
@@ -26,7 +26,7 @@ const account = {
 };
 
 const DEFAULT_PROPS = {
-  identity: account,
+  account,
   onClose: jest.fn(),
   onHide: jest.fn(),
   isRemovable: false,
@@ -52,19 +52,6 @@ describe('AccountListItem', () => {
     expect(getByTestId('account-list-menu-remove')).toBeInTheDocument();
   });
 
-  it('renders Connect account button', () => {
-    process.env.MULTICHAIN = 1;
-    const { getByTestId } = render({ isRemovable: true });
-    const connectAccountButton = getByTestId(
-      'account-list-menu-connect-account',
-    );
-    expect(connectAccountButton).toBeInTheDocument();
-    fireEvent.click(connectAccountButton);
-    expect(mockAddPermittedAccount).toHaveBeenCalled();
-
-    delete process.env.MULTICHAIN;
-  });
-
   it('should render remove JWT menu item if the user is custodian and click the button', async () => {
     const mockedGetCustodianToken = jest
       .fn()
@@ -85,7 +72,7 @@ describe('AccountListItem', () => {
       balance: '0x152387ad22c3f0',
     };
 
-    const { getByTestId } = render({ identity: newAccount });
+    const { getByTestId } = render({ account: newAccount });
 
     const removeJWTButton = getByTestId('account-options-menu__remove-jwt');
 
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 bc77e6a4276f..be8a81fe10ef 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
@@ -3,48 +3,171 @@
 exports[`AccountListItem renders AccountListItem component and shows account name, address, and balance 1`] = `
 <div>
   <div
-    class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+    class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
   >
     <div
-      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+      class="mm-box mm-box--display-flex mm-box--sm:display-none"
+      data-testid="account-list-item-badge"
+    >
+      <button
+        class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+        data-testid="multichain-badge-status"
+      >
+        <div>
+          <div
+            aria-describedby="tippy-tooltip-1"
+            class=""
+            data-original-title="Not connected"
+            data-tooltipped=""
+            style="display: inline;"
+            tabindex="0"
+          >
+            <div
+              class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+            >
+              <div
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              >
+                <div
+                  class="mm-avatar-account__jazzicon"
+                >
+                  <div
+                    style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+                  >
+                    <svg
+                      height="32"
+                      width="32"
+                      x="0"
+                      y="0"
+                    >
+                      <rect
+                        fill="#18CDF2"
+                        height="32"
+                        transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                        width="32"
+                        x="0"
+                        y="0"
+                      />
+                      <rect
+                        fill="#035E56"
+                        height="32"
+                        transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                        width="32"
+                        x="0"
+                        y="0"
+                      />
+                      <rect
+                        fill="#F26602"
+                        height="32"
+                        transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                        width="32"
+                        x="0"
+                        y="0"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="mm-box mm-badge-wrapper__badge-container"
+                style="bottom: -1px; right: 2px;"
+              >
+                <div
+                  class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </button>
+    </div>
+    <div
+      class="mm-box mm-box--display-none mm-box--sm:display-flex"
     >
       <div
-        class="mm-avatar-account__jazzicon"
+        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
       >
         <div
-          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+          class="mm-avatar-account__jazzicon"
         >
-          <svg
-            height="32"
-            width="32"
-            x="0"
-            y="0"
+          <div
+            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
           >
-            <rect
-              fill="#18CDF2"
-              height="32"
-              transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#035E56"
+            <svg
               height="32"
-              transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
               width="32"
               x="0"
               y="0"
-            />
-            <rect
-              fill="#F26602"
+            >
+              <rect
+                fill="#18CDF2"
+                height="32"
+                transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                width="32"
+                x="0"
+                y="0"
+              />
+              <rect
+                fill="#035E56"
+                height="32"
+                transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                width="32"
+                x="0"
+                y="0"
+              />
+              <rect
+                fill="#F26602"
+                height="32"
+                transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                width="32"
+                x="0"
+                y="0"
+              />
+            </svg>
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+      >
+        <div
+          class="mm-avatar-account__jazzicon"
+        >
+          <div
+            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+          >
+            <svg
               height="32"
-              transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
               width="32"
               x="0"
               y="0"
-            />
-          </svg>
+            >
+              <rect
+                fill="#18CDF2"
+                height="32"
+                transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                width="32"
+                x="0"
+                y="0"
+              />
+              <rect
+                fill="#035E56"
+                height="32"
+                transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                width="32"
+                x="0"
+                y="0"
+              />
+              <rect
+                fill="#F26602"
+                height="32"
+                transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                width="32"
+                x="0"
+                y="0"
+              />
+            </svg>
+          </div>
         </div>
       </div>
     </div>
diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
index e3b03a4259b7..70db032eb455 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -11,7 +11,6 @@ import { ConnectedAccountsMenu } from '../connected-accounts-menu';
 import {
   AvatarAccount,
   AvatarAccountVariant,
-  AvatarFavicon,
   AvatarToken,
   AvatarTokenSize,
   Box,
@@ -48,7 +47,7 @@ import {
 } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
-  getAddressConnectedSubjectMap,
+  isAccountConnectedToCurrentTab,
   getCurrentNetwork,
   getNativeCurrencyImage,
   getShowFiatInTestnets,
@@ -58,25 +57,28 @@ import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBa
 import { TEST_NETWORKS } from '../../../../shared/constants/network';
 import { ConnectedStatus } from '../connected-status/connected-status';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
+///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+import { getCustodianIconForAddress } from '../../../selectors/institutional/selectors';
+///: END:ONLY_INCLUDE_IF
 import { AccountListItemMenuTypes } from './account-list-item.types';
 
 const MAXIMUM_CURRENCY_DECIMALS = 3;
 const MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP = 17;
 
 export const AccountListItem = ({
-  identity,
+  account,
   selected = false,
   onClick,
   closeMenu,
   accountsCount,
   connectedAvatar,
-  connectedAvatarName,
   isPinned = false,
   menuType = AccountListItemMenuTypes.None,
   isHidden = false,
   currentTabOrigin,
   isActive = false,
   startAccessory,
+  onActionClick,
 }) => {
   const t = useI18nContext();
   const [accountOptionsMenuOpen, setAccountOptionsMenuOpen] = useState(false);
@@ -92,16 +94,22 @@ export const AccountListItem = ({
   const showFiat =
     TEST_NETWORKS.includes(currentNetwork?.nickname) && !showFiatInTestnets;
   const { totalWeiBalance, orderedTokenList } = useAccountTotalFiatBalance(
-    identity.address,
+    account.address,
   );
   const mappedOrderedTokenList = orderedTokenList.map((item) => ({
     avatarValue: item.iconUrl,
   }));
   let balanceToTranslate = totalWeiBalance;
   if (showFiat) {
-    balanceToTranslate = identity.balance;
+    balanceToTranslate = account.balance;
   }
 
+  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+  const custodianIcon = useSelector((state) =>
+    getCustodianIconForAddress(state, account.address),
+  );
+  ///: END:ONLY_INCLUDE_IF
+
   // If this is the selected item in the Account menu,
   // scroll the item into view
   const itemRef = useRef(null);
@@ -114,11 +122,8 @@ export const AccountListItem = ({
   const trackEvent = useContext(MetaMetricsContext);
   const primaryTokenImage = useSelector(getNativeCurrencyImage);
   const nativeCurrency = useSelector(getNativeCurrency);
-  const addressConnectedSubjectMap = useSelector(getAddressConnectedSubjectMap);
-  const selectedAddressSubjectMap =
-    addressConnectedSubjectMap[identity.address];
-  const currentTabIsConnectedToSelectedAddress = Boolean(
-    selectedAddressSubjectMap && selectedAddressSubjectMap[currentTabOrigin],
+  const currentTabIsConnectedToSelectedAddress = useSelector((state) =>
+    isAccountConnectedToCurrentTab(state, account.address),
   );
   const isConnected =
     currentTabOrigin && currentTabIsConnectedToSelectedAddress;
@@ -132,6 +137,7 @@ export const AccountListItem = ({
       className={classnames('multichain-account-list-item', {
         'multichain-account-list-item--selected': selected,
         'multichain-account-list-item--connected': Boolean(connectedAvatar),
+        'multichain-account-list-item--clickable': Boolean(onClick),
       })}
       ref={itemRef}
       onClick={() => {
@@ -154,19 +160,21 @@ export const AccountListItem = ({
           backgroundColor={Color.primaryDefault}
         />
       )}
-      {process.env.MULTICHAIN ? (
-        <>
-          <Box
-            display={[Display.Flex, Display.None]}
-            data-testid="account-list-item-badge"
-          >
-            <ConnectedStatus address={identity.address} isActive={isActive} />
-          </Box>
-          <Box display={[Display.None, Display.Flex]}>
+
+      <>
+        <Box
+          display={[Display.Flex, Display.None]}
+          data-testid="account-list-item-badge"
+        >
+          <ConnectedStatus address={account.address} isActive={isActive} />
+        </Box>
+        <Box display={[Display.None, Display.Flex]}>
+          {
+            ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
             <AvatarAccount
               borderColor={BorderColor.transparent}
               size={Size.MD}
-              address={identity.address}
+              address={account.address}
               variant={
                 useBlockie
                   ? AvatarAccountVariant.Blockies
@@ -174,21 +182,36 @@ export const AccountListItem = ({
               }
               marginInlineEnd={2}
             />
-          </Box>
-        </>
-      ) : (
-        <AvatarAccount
-          borderColor={BorderColor.transparent}
-          size={Size.MD}
-          address={identity.address}
-          variant={
-            useBlockie
-              ? AvatarAccountVariant.Blockies
-              : AvatarAccountVariant.Jazzicon
+            ///: END:ONLY_INCLUDE_IF
           }
-          marginInlineEnd={2}
-        />
-      )}
+
+          {
+            ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+            custodianIcon ? (
+              <img
+                src={custodianIcon}
+                data-testid="custody-logo"
+                className="custody-logo"
+                alt="custody logo"
+              />
+            ) : (
+              <AvatarAccount
+                borderColor={BorderColor.transparent}
+                size={Size.MD}
+                address={account.address}
+                variant={
+                  useBlockie
+                    ? AvatarAccountVariant.Blockies
+                    : AvatarAccountVariant.Jazzicon
+                }
+                marginInlineEnd={2}
+              />
+            )
+            ///: END:ONLY_INCLUDE_IF
+          }
+        </Box>
+      </>
+
       <Box
         display={Display.Flex}
         flexDirection={FlexDirection.Column}
@@ -234,17 +257,17 @@ export const AccountListItem = ({
                 textAlign={TextAlign.Left}
                 ellipsis
               >
-                {identity.metadata.name.length >
+                {account.metadata.name.length >
                 MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
                   <Tooltip
-                    title={identity.metadata.name}
+                    title={account.metadata.name}
                     position="bottom"
                     wrapperClassName="multichain-account-list-item__tooltip"
                   >
-                    {identity.metadata.name}
+                    {account.metadata.name}
                   </Tooltip>
                 ) : (
-                  identity.metadata.name
+                  account.metadata.name
                 )}
               </Text>
             </Box>
@@ -274,16 +297,8 @@ export const AccountListItem = ({
           justifyContent={JustifyContent.spaceBetween}
         >
           <Box display={Display.Flex} alignItems={AlignItems.center}>
-            {connectedAvatar ? (
-              <AvatarFavicon
-                size={Size.XS}
-                src={connectedAvatar}
-                name={connectedAvatarName}
-                className="multichain-account-list-item__avatar"
-              />
-            ) : null}
             <Text variant={TextVariant.bodySm} color={Color.textAlternative}>
-              {shortenAddress(toChecksumHexAddress(identity.address))}
+              {shortenAddress(toChecksumHexAddress(account.address))}
             </Text>
           </Box>
           {mappedOrderedTokenList.length > 1 ? (
@@ -310,7 +325,7 @@ export const AccountListItem = ({
               >
                 <UserPreferencedCurrencyDisplay
                   ethNumberOfDecimals={MAXIMUM_CURRENCY_DECIMALS}
-                  value={identity.balance}
+                  value={account.balance}
                   type={SECONDARY}
                   showNative
                 />
@@ -318,15 +333,15 @@ export const AccountListItem = ({
             </Box>
           )}
         </Box>
-        {identity.label ? (
+        {account.label ? (
           <Tag
-            label={identity.label}
+            label={account.label}
             labelProps={{
               variant: TextVariant.bodyXs,
               color: Color.textAlternative,
             }}
             startIconName={
-              identity.metadata.keyring.type === KeyringType.snap
+              account.metadata.keyring.type === KeyringType.snap
                 ? IconName.Snaps
                 : null
             }
@@ -336,7 +351,7 @@ export const AccountListItem = ({
 
       {menuType === AccountListItemMenuTypes.None ? null : (
         <ButtonIcon
-          ariaLabel={`${identity.metadata.name} ${t('options')}`}
+          ariaLabel={`${account.metadata.name} ${t('options')}`}
           iconName={IconName.MoreVertical}
           size={IconSize.Sm}
           ref={setAccountListItemMenuRef}
@@ -359,10 +374,10 @@ export const AccountListItem = ({
       {menuType === AccountListItemMenuTypes.Account && (
         <AccountListItemMenu
           anchorElement={accountListItemMenuElement}
-          identity={identity}
+          account={account}
           onClose={() => setAccountOptionsMenuOpen(false)}
           isOpen={accountOptionsMenuOpen}
-          isRemovable={identity.keyring.type !== KeyringType.hdKeyTree}
+          isRemovable={account.keyring.type !== KeyringType.hdKeyTree}
           closeMenu={closeMenu}
           isPinned={isPinned}
           isHidden={isHidden}
@@ -372,11 +387,13 @@ export const AccountListItem = ({
       {menuType === AccountListItemMenuTypes.Connection && (
         <ConnectedAccountsMenu
           anchorElement={accountListItemMenuElement}
-          identity={identity}
+          account={account}
           onClose={() => setAccountOptionsMenuOpen(false)}
           closeMenu={closeMenu}
           disableAccountSwitcher={isSingleAccount}
           isOpen={accountOptionsMenuOpen}
+          onActionClick={onActionClick}
+          activeTabOrigin={currentTabOrigin}
         />
       )}
     </Box>
@@ -387,7 +404,7 @@ AccountListItem.propTypes = {
   /**
    * An account object that has name, address, and balance data
    */
-  identity: PropTypes.shape({
+  account: PropTypes.shape({
     id: PropTypes.string.isRequired,
     address: PropTypes.string.isRequired,
     balance: PropTypes.string.isRequired,
@@ -424,13 +441,13 @@ AccountListItem.propTypes = {
    */
   closeMenu: PropTypes.func,
   /**
-   * File location of the avatar icon
+   * Function to set account name to show disconnect toast when an account is disconnected
    */
-  connectedAvatar: PropTypes.string,
+  onActionClick: PropTypes.func,
   /**
-   * Text used as the avatar alt text
+   * File location of the avatar icon
    */
-  connectedAvatarName: PropTypes.string,
+  connectedAvatar: PropTypes.string,
   /**
    * Represents the type of menu to be rendered
    */
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
index 0cd5f85a7406..913879b5a71a 100644
--- a/ui/components/multichain/account-list-item/account-list-item.stories.js
+++ b/ui/components/multichain/account-list-item/account-list-item.stories.js
@@ -52,7 +52,7 @@ const CHAOS_ACCOUNT = {
   balance: '0x152387ad22c3f0',
 };
 
-const SNAP_IDENTITY = {
+const SNAP_ACCOUNT = {
   ...testData.metamask.internalAccounts.accounts[
     '784225f4-d30b-4e77-a900-c8bbce735b88'
   ],
@@ -88,7 +88,7 @@ export default {
   title: 'Components/Multichain/AccountListItem',
   component: AccountListItem,
   argTypes: {
-    identity: {
+    account: {
       control: 'object',
     },
     selected: {
@@ -111,7 +111,7 @@ export default {
     },
   },
   args: {
-    identity: SIMPLE_ACCOUNT,
+    account: SIMPLE_ACCOUNT,
     onClick,
     menuType: AccountListItemMenuTypes.Account,
   },
@@ -136,7 +136,7 @@ export const HardwareItem = (args) => (
     <AccountListItem {...args} />
   </div>
 );
-HardwareItem.args = { identity: HARDWARE_ACCOUNT };
+HardwareItem.args = { account: HARDWARE_ACCOUNT };
 HardwareItem.decorators = [
   (story) => <Provider store={store}>{story()}</Provider>,
 ];
@@ -146,7 +146,7 @@ export const SelectedHardwareItem = (args) => (
     <AccountListItem {...args} />
   </div>
 );
-SelectedHardwareItem.args = { identity: HARDWARE_ACCOUNT, selected: true };
+SelectedHardwareItem.args = { account: HARDWARE_ACCOUNT, selected: true };
 SelectedHardwareItem.decorators = [
   (story) => <Provider store={store}>{story()}</Provider>,
 ];
@@ -156,7 +156,7 @@ export const ChaosDataItem = (args) => (
     <AccountListItem {...args} />
   </div>
 );
-ChaosDataItem.args = { identity: CHAOS_ACCOUNT };
+ChaosDataItem.args = { account: CHAOS_ACCOUNT };
 
 export const ConnectedSiteItem = (args) => (
   <div {...CONTAINER_STYLES}>
@@ -174,7 +174,7 @@ export const ConnectedSiteChaosItem = (args) => (
   </div>
 );
 ConnectedSiteChaosItem.args = {
-  identity: CHAOS_ACCOUNT,
+  account: CHAOS_ACCOUNT,
   connectedAvatar: 'https://uniswap.org/favicon.ico',
   connectedAvatarName: 'Uniswap',
 };
@@ -185,7 +185,7 @@ export const ChaosStartAccessoryDataItem = (args) => (
   </div>
 );
 ChaosStartAccessoryDataItem.args = {
-  identity: CHAOS_ACCOUNT,
+  account: CHAOS_ACCOUNT,
   startAccessory: <Checkbox />,
 };
 
@@ -194,7 +194,7 @@ export const SnapItem = (args) => (
     <AccountListItem {...args} />
   </div>
 );
-SnapItem.args = { identity: SNAP_IDENTITY };
+SnapItem.args = { account: SNAP_ACCOUNT };
 SnapItem.decorators = [(story) => <Provider store={store}>{story()}</Provider>];
 
 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
index 3b99ea931ce7..03433eb112ab 100644
--- a/ui/components/multichain/account-list-item/account-list-item.test.js
+++ b/ui/components/multichain/account-list-item/account-list-item.test.js
@@ -19,7 +19,7 @@ const account = {
 };
 
 const DEFAULT_PROPS = {
-  identity: account,
+  account,
   onClick: jest.fn(),
 };
 
@@ -62,7 +62,7 @@ describe('AccountListItem', () => {
   it('renders the account name tooltip for long names', () => {
     render({
       selected: true,
-      identity: {
+      account: {
         ...account,
         metadata: {
           ...account.metadata,
@@ -107,19 +107,9 @@ describe('AccountListItem', () => {
     ).toBeInTheDocument();
   });
 
-  it('renders connected site icon', () => {
-    const connectedAvatarName = 'Uniswap';
-    const { getByAltText } = render({
-      connectedAvatar: 'https://uniswap.org/favicon.ico',
-      connectedAvatarName,
-    });
-
-    expect(getByAltText(`${connectedAvatarName} logo`)).toBeInTheDocument();
-  });
-
   it('does not render a tag for a null label', () => {
     const { container } = render({
-      identity: {
+      account: {
         ...account,
         label: null,
       },
@@ -130,7 +120,7 @@ describe('AccountListItem', () => {
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   it('renders the snap label for unnamed snap accounts', () => {
     const { container } = render({
-      identity: {
+      account: {
         ...account,
         balance: '0x0',
         keyring: 'Snap Keyring',
@@ -143,7 +133,7 @@ describe('AccountListItem', () => {
 
   it('renders the snap name for named snap accounts', () => {
     const { container } = render({
-      identity: {
+      account: {
         ...account,
         balance: '0x0',
         keyring: 'Snap Keyring',
diff --git a/ui/components/multichain/account-list-item/index.scss b/ui/components/multichain/account-list-item/index.scss
index 243f9f8846cd..8b24fe45902f 100644
--- a/ui/components/multichain/account-list-item/index.scss
+++ b/ui/components/multichain/account-list-item/index.scss
@@ -1,9 +1,21 @@
 .multichain-account-list-item {
   position: relative;
   width: 100%;
-  cursor: pointer;
 
-  &:not(.account-list-item--selected) {
+  &--clickable {
+    cursor: pointer;
+  }
+
+  &:not(.multichain-account-list-item--clickable) {
+    cursor: default;
+
+    .multichain-account-list-item__account-name__button,
+    .multichain-badge-status {
+      cursor: default;
+    }
+  }
+
+  &:not(.multichain-account-list-item--selected) {
     &:hover,
     &:focus-within {
       background: var(--color-background-default-hover);
@@ -71,3 +83,10 @@
     }
   }
 }
+
+.list-item-custody-logo {
+  height: 32px;
+  padding: 1px;
+  margin-right: 8px;
+  margin-top: 5px;
+}
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 9eb8318d5c07..5a4bbc8eccd0 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.js
+++ b/ui/components/multichain/account-list-menu/account-list-menu.js
@@ -391,12 +391,11 @@ export const AccountListMenu = ({
                         });
                         dispatch(setSelectedAccount(account.address));
                       }}
-                      identity={account}
+                      account={account}
                       key={account.address}
                       selected={selectedAccount.address === account.address}
                       closeMenu={onClose}
                       connectedAvatar={connectedSite?.iconUrl}
-                      connectedAvatarName={connectedSite?.name}
                       menuType={AccountListItemMenuTypes.Account}
                       isPinned={Boolean(account.pinned)}
                       isHidden={Boolean(account.hidden)}
diff --git a/ui/components/multichain/account-list-menu/hidden-account-list.js b/ui/components/multichain/account-list-menu/hidden-account-list.js
index c4390619ade2..b31c0f865276 100644
--- a/ui/components/multichain/account-list-menu/hidden-account-list.js
+++ b/ui/components/multichain/account-list-menu/hidden-account-list.js
@@ -125,12 +125,11 @@ export const HiddenAccountList = ({ onClose }) => {
                     });
                     dispatch(setSelectedAccount(account.address));
                   }}
-                  identity={account}
+                  account={account}
                   key={account.address}
                   selected={selectedAccount.address === account.address}
                   closeMenu={onClose}
                   connectedAvatar={connectedSite?.iconUrl}
-                  connectedAvatarName={connectedSite?.name}
                   menuType={AccountListItemMenuTypes.Account}
                   isPinned={Boolean(account.pinned)}
                   isHidden={Boolean(account.hidden)}
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
index d4331d7d0462..1cc90ff2710c 100644
--- a/ui/components/multichain/account-picker/__snapshots__/account-picker.test.js.snap
+++ b/ui/components/multichain/account-picker/__snapshots__/account-picker.test.js.snap
@@ -9,6 +9,17 @@ exports[`AccountPicker renders properly 1`] = `
     <span
       class="mm-box mm-text mm-text--inherit mm-text--ellipsis mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default"
     >
+      <div
+        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+      >
+        <img
+          alt=""
+          height="16"
+          src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0ib3B0aW1pemVTcGVlZCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij48cGF0aCBmaWxsPSJoc2woMTM5IDg5JSA1OSUpIiBkPSJNMCwwSDhWOEgweiIvPjxwYXRoIGZpbGw9ImhzbCgzMjEgOTIlIDU2JSkiIGQ9Ik0xLDJoMXYxaC0xek02LDJoMXYxaC0xek0yLDJoMXYxaC0xek01LDJoMXYxaC0xek0zLDJoMXYxaC0xek00LDJoMXYxaC0xek0zLDNoMXYxaC0xek00LDNoMXYxaC0xek0wLDRoMXYxaC0xek03LDRoMXYxaC0xek0yLDRoMXYxaC0xek01LDRoMXYxaC0xek0wLDZoMXYxaC0xek03LDZoMXYxaC0xek0xLDZoMXYxaC0xek02LDZoMXYxaC0xek0zLDZoMXYxaC0xek00LDZoMXYxaC0xek0wLDdoMXYxaC0xek03LDdoMXYxaC0xek0yLDdoMXYxaC0xek01LDdoMXYxaC0xek0zLDdoMXYxaC0xek00LDdoMXYxaC0xeiIvPjxwYXRoIGZpbGw9ImhzbCgzMjUgNDclIDU1JSkiIGQ9Ik0xLDBoMXYxaC0xek02LDBoMXYxaC0xek0zLDFoMXYxaC0xek00LDFoMXYxaC0xek0wLDVoMXYxaC0xek03LDVoMXYxaC0xeiIvPjwvc3ZnPg=="
+          style="border-radius: 50%;"
+          width="16"
+        />
+      </div>
       <div
         class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
       >
diff --git a/ui/components/multichain/account-picker/account-picker.js b/ui/components/multichain/account-picker/account-picker.js
index acfac12adbb3..9005f2764e5e 100644
--- a/ui/components/multichain/account-picker/account-picker.js
+++ b/ui/components/multichain/account-picker/account-picker.js
@@ -18,7 +18,15 @@ import {
   IconColor,
   Size,
 } from '../../../helpers/constants/design-system';
-import { getUseBlockie } from '../../../selectors';
+import {
+  getUseBlockie,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+  getSelectedAddress,
+  ///: END:ONLY_INCLUDE_IF
+} from '../../../selectors';
+///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+import { getCustodianIconForAddress } from '../../../selectors/institutional/selectors';
+///: END:ONLY_INCLUDE_IF
 
 export const AccountPicker = ({
   address,
@@ -32,6 +40,13 @@ export const AccountPicker = ({
 }) => {
   const useBlockie = useSelector(getUseBlockie);
 
+  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+  const selectedAddress = useSelector(getSelectedAddress);
+  const custodianIcon = useSelector((state) =>
+    getCustodianIconForAddress(state, selectedAddress),
+  );
+  ///: END:ONLY_INCLUDE_IF
+
   return (
     <ButtonBase
       className={classnames('multichain-account-picker', className)}
@@ -56,16 +71,45 @@ export const AccountPicker = ({
       {...props}
       gap={2}
     >
-      <AvatarAccount
-        variant={
-          useBlockie
-            ? AvatarAccountVariant.Blockies
-            : AvatarAccountVariant.Jazzicon
-        }
-        address={address}
-        size={Size.XS}
-        borderColor={BackgroundColor.backgroundDefault} // we currently don't have white color for border hence using backgroundDefault as the border
-      />
+      {
+        ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+        <AvatarAccount
+          variant={
+            useBlockie
+              ? AvatarAccountVariant.Blockies
+              : AvatarAccountVariant.Jazzicon
+          }
+          address={address}
+          size={Size.XS}
+          borderColor={BackgroundColor.backgroundDefault} // we currently don't have white color for border hence using backgroundDefault as the border
+        />
+        ///: END:ONLY_INCLUDE_IF
+      }
+
+      {
+        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+        custodianIcon ? (
+          <img
+            src={custodianIcon}
+            data-testid="custody-logo"
+            className="custody-logo"
+            alt="custody logo"
+          />
+        ) : (
+          <AvatarAccount
+            variant={
+              useBlockie
+                ? AvatarAccountVariant.Blockies
+                : AvatarAccountVariant.Jazzicon
+            }
+            address={address}
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+          />
+        )
+        ///: END:ONLY_INCLUDE_IF
+      }
+
       <Text
         as="span"
         ellipsis
diff --git a/ui/components/multichain/address-copy-button/index.scss b/ui/components/multichain/address-copy-button/index.scss
index d849a1ea83bd..7065e0e1f8dc 100644
--- a/ui/components/multichain/address-copy-button/index.scss
+++ b/ui/components/multichain/address-copy-button/index.scss
@@ -8,8 +8,6 @@
 
 .custody-logo {
   height: 20px;
-  margin-right: 5px;
   background-color: var(--color-background-default);
-  border-radius: 3px;
   padding: 1px;
 }
diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
index 5bafc35a2208..d81f6b755a6f 100644
--- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
+++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
@@ -207,12 +207,14 @@ exports[`App Header should match snapshot 1`] = `
     >
       <div>
         <button
+          aria-label="Network Menu Chain 5"
           class="mm-box mm-picker-network multichain-app-header__contents__network-picker mm-box--margin-2 mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-none mm-box--sm:display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
           data-testid="network-display"
           disabled=""
         >
           <div
             class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            role="img"
           >
             C
           </div>
@@ -231,12 +233,55 @@ exports[`App Header should match snapshot 1`] = `
         class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--color-text-default"
       >
         <button
-          class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-base--ellipsis multichain-account-picker mm-text--body-md-medium mm-text--ellipsis mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--gap-2 mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-lg"
+          class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-base--ellipsis multichain-account-picker mm-text--body-md-medium mm-text--ellipsis mm-box--padding-0 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-inline-flex mm-box--gap-2 mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-lg"
           data-testid="account-menu-icon"
         >
           <span
             class="mm-box mm-text mm-text--inherit mm-text--ellipsis mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default"
           >
+            <div
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default 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: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
+                >
+                  <svg
+                    height="16"
+                    width="16"
+                    x="0"
+                    y="0"
+                  >
+                    <rect
+                      fill="#18CDF2"
+                      height="16"
+                      transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
+                      width="16"
+                      x="0"
+                      y="0"
+                    />
+                    <rect
+                      fill="#035E56"
+                      height="16"
+                      transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
+                      width="16"
+                      x="0"
+                      y="0"
+                    />
+                    <rect
+                      fill="#F26602"
+                      height="16"
+                      transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
+                      width="16"
+                      x="0"
+                      y="0"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
             <div
               class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
             >
@@ -324,6 +369,7 @@ exports[`App Header should match snapshot 1`] = `
       </div>
       <div
         class="mm-box mm-box--display-flex mm-box--justify-content-flex-end mm-box--align-items-center"
+        style="margin-left: auto;"
       >
         <div
           class="mm-box mm-box--display-flex mm-box--gap-4"
diff --git a/ui/components/multichain/app-header/app-header.js b/ui/components/multichain/app-header/app-header.js
index ab1a3adc0ed9..40c425ced2ef 100644
--- a/ui/components/multichain/app-header/app-header.js
+++ b/ui/components/multichain/app-header/app-header.js
@@ -12,7 +12,6 @@ import {
 import {
   BUILD_QUOTE_ROUTE,
   CONFIRM_TRANSACTION_ROUTE,
-  CONNECTED_ACCOUNTS_ROUTE,
   CONNECTIONS,
   DEFAULT_ROUTE,
   SWAPS_ROUTE,
@@ -45,47 +44,34 @@ import {
 import {
   getCurrentChainId,
   getCurrentNetwork,
-  getOnboardedInThisUISession,
   getOriginOfCurrentTab,
-  getShowProductTour,
   getTestNetworkBackgroundColor,
   getSelectedInternalAccount,
   getUnapprovedTransactions,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-  getTheme,
-  ///: END:ONLY_INCLUDE_IF
 } from '../../../selectors';
-import { AccountPicker, GlobalMenu, ProductTour } from '..';
+import { AccountPicker, GlobalMenu } from '..';
 
-import {
-  hideProductTour,
-  toggleAccountMenu,
-  toggleNetworkMenu,
-} from '../../../store/actions';
+import { toggleAccountMenu, toggleNetworkMenu } from '../../../store/actions';
 import MetafoxLogo from '../../ui/metafox-logo';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import ConnectedStatusIndicator from '../../app/connected-status-indicator';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  getCompletedOnboarding,
-  getIsUnlocked,
-} from '../../../ducks/metamask/metamask';
+import { getIsUnlocked } from '../../../ducks/metamask/metamask';
 import { SEND_STAGES, getSendStage } from '../../../ducks/send';
 import Tooltip from '../../ui/tooltip';
 import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { MINUTE } from '../../../../shared/constants/time';
-import { getURLHost, shortenAddress } from '../../../helpers/utils/util';
+import { shortenAddress } from '../../../helpers/utils/util';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
+import { MultichainMetaFoxLogo } from './multichain-meta-fox-logo';
 
 export const AppHeader = ({ location }) => {
   const trackEvent = useContext(MetaMetricsContext);
   const [accountOptionsMenuOpen, setAccountOptionsMenuOpen] = useState(false);
-  const [multichainProductTourStep, setMultichainProductTourStep] = useState(1);
   const menuRef = useRef(null);
   const origin = useSelector(getOriginOfCurrentTab);
   const history = useHistory();
-  const isHomePage = location.pathname === DEFAULT_ROUTE;
   const isUnlocked = useSelector(getIsUnlocked);
   const t = useI18nContext();
   const chainId = useSelector(getCurrentChainId);
@@ -96,13 +82,6 @@ export const AppHeader = ({ location }) => {
     internalAccount &&
     shortenAddress(toChecksumHexAddress(internalAccount.address));
   const dispatch = useDispatch();
-  const completedOnboarding = useSelector(getCompletedOnboarding);
-  const onboardedInThisUISession = useSelector(getOnboardedInThisUISession);
-  const showProductTourPopup = useSelector(getShowProductTour);
-
-  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-  const theme = useSelector((state) => getTheme(state));
-  ///: END:ONLY_INCLUDE_IF
 
   // Used for network icon / dropdown
   const currentNetwork = useSelector(getCurrentNetwork);
@@ -120,11 +99,6 @@ export const AppHeader = ({ location }) => {
     getEnvironmentType() === ENVIRONMENT_TYPE_POPUP &&
     origin &&
     origin !== browser.runtime.id;
-  const showProductTour =
-    completedOnboarding && !onboardedInThisUISession && showProductTourPopup;
-  const productTourDirection = document
-    .querySelector('[dir]')
-    ?.getAttribute('dir');
 
   // Disable the network and account pickers if the user is in
   // a critical flow
@@ -175,9 +149,7 @@ export const AppHeader = ({ location }) => {
   }, [chainId, dispatch, trackEvent]);
 
   const handleConnectionsRoute = () => {
-    const hostName = getURLHost(origin);
-
-    history.push(`${CONNECTIONS}/${encodeURIComponent(hostName)}`);
+    history.push(`${CONNECTIONS}/${encodeURIComponent(origin)}`);
   };
   // This is required to ensure send and confirmation screens
   // look as desired
@@ -185,24 +157,7 @@ export const AppHeader = ({ location }) => {
 
   return (
     <>
-      {isUnlocked && !popupStatus ? (
-        <Box
-          display={[Display.None, Display.Flex]}
-          alignItems={AlignItems.center}
-          margin={2}
-          className="multichain-app-header-logo"
-          data-testid="app-header-logo"
-          justifyContent={JustifyContent.center}
-        >
-          <MetafoxLogo
-            unsetIconHeight
-            onClick={async () => history.push(DEFAULT_ROUTE)}
-            ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-            theme={theme}
-            ///: END:ONLY_INCLUDE_IF
-          />
-        </Box>
-      ) : null}
+      {isUnlocked && !popupStatus ? <MultichainMetaFoxLogo /> : null}
       <Box
         display={Display.Flex}
         className={classnames('multichain-app-header', {
@@ -237,13 +192,16 @@ export const AppHeader = ({ location }) => {
                     <PickerNetwork
                       avatarNetworkProps={{
                         backgroundColor: testNetworkBackgroundColor,
+                        role: 'img',
                       }}
                       className="multichain-app-header__contents--avatar-network"
                       ref={menuRef}
                       as="button"
                       src={currentNetwork?.rpcPrefs?.imageUrl}
                       label={currentNetwork?.nickname}
-                      aria-label={t('networkMenu')}
+                      aria-label={`${t('networkMenu')} ${
+                        currentNetwork?.nickname
+                      }`}
                       labelProps={{
                         display: Display.None,
                       }}
@@ -262,8 +220,12 @@ export const AppHeader = ({ location }) => {
                   <PickerNetwork
                     avatarNetworkProps={{
                       backgroundColor: testNetworkBackgroundColor,
+                      role: 'img',
                     }}
                     margin={2}
+                    aria-label={`${t('networkMenu')} ${
+                      currentNetwork?.nickname
+                    }`}
                     label={currentNetwork?.nickname}
                     src={currentNetwork?.rpcPrefs?.imageUrl}
                     onClick={(e) => {
@@ -278,24 +240,6 @@ export const AppHeader = ({ location }) => {
                   />
                 </div>
               )}
-              {showProductTour &&
-              popupStatus &&
-              isHomePage &&
-              multichainProductTourStep === 1 ? (
-                <ProductTour
-                  className="multichain-app-header__product-tour"
-                  anchorElement={menuRef.current}
-                  title={t('switcherTitle')}
-                  description={t('switcherTourDescription')}
-                  currentStep="1"
-                  totalSteps="3"
-                  onClick={() =>
-                    setMultichainProductTourStep(multichainProductTourStep + 1)
-                  }
-                  positionObj={productTourDirection === 'rtl' ? '0%' : '88%'}
-                  productTourDirection={productTourDirection}
-                />
-              ) : null}
 
               {internalAccount ? (
                 <Text
@@ -321,6 +265,8 @@ export const AppHeader = ({ location }) => {
                     }}
                     disabled={disableAccountPicker}
                     labelProps={{ fontWeight: FontWeight.Bold }}
+                    paddingLeft={2}
+                    paddingRight={2}
                   />
                   <Tooltip
                     position="left"
@@ -364,52 +310,18 @@ export const AppHeader = ({ location }) => {
                 display={Display.Flex}
                 alignItems={AlignItems.center}
                 justifyContent={JustifyContent.flexEnd}
+                style={{ marginLeft: 'auto' }}
               >
                 <Box display={Display.Flex} gap={4}>
                   {showConnectedStatus ? (
                     <Box ref={menuRef}>
                       <ConnectedStatusIndicator
                         onClick={() => {
-                          if (process.env.MULTICHAIN) {
-                            handleConnectionsRoute();
-                          } else {
-                            history.push(CONNECTED_ACCOUNTS_ROUTE);
-                            trackEvent({
-                              event:
-                                MetaMetricsEventName.NavConnectedSitesOpened,
-                              category: MetaMetricsEventCategory.Navigation,
-                            });
-                          }
+                          handleConnectionsRoute();
                         }}
                       />
                     </Box>
                   ) : null}{' '}
-                  {popupStatus && multichainProductTourStep === 2 ? (
-                    <ProductTour
-                      className="multichain-app-header__product-tour"
-                      anchorElement={menuRef.current}
-                      closeMenu={() => setAccountOptionsMenuOpen(false)}
-                      prevIcon
-                      title={t('permissionsTitle')}
-                      description={t('permissionsTourDescription')}
-                      currentStep="2"
-                      totalSteps="3"
-                      prevClick={() =>
-                        setMultichainProductTourStep(
-                          multichainProductTourStep - 1,
-                        )
-                      }
-                      onClick={() =>
-                        setMultichainProductTourStep(
-                          multichainProductTourStep + 1,
-                        )
-                      }
-                      positionObj={
-                        productTourDirection === 'rtl' ? '76%' : '12%'
-                      }
-                      productTourDirection={productTourDirection}
-                    />
-                  ) : null}
                   <Box
                     ref={menuRef}
                     display={Display.Flex}
@@ -439,30 +351,6 @@ export const AppHeader = ({ location }) => {
                   isOpen={accountOptionsMenuOpen}
                   closeMenu={() => setAccountOptionsMenuOpen(false)}
                 />
-                {showProductTour &&
-                popupStatus &&
-                multichainProductTourStep === 3 ? (
-                  <ProductTour
-                    className="multichain-app-header__product-tour"
-                    anchorElement={menuRef.current}
-                    closeMenu={() => setAccountOptionsMenuOpen(false)}
-                    prevIcon
-                    title={t('globalTitle')}
-                    description={t('globalTourDescription')}
-                    currentStep="3"
-                    totalSteps="3"
-                    prevClick={() =>
-                      setMultichainProductTourStep(
-                        multichainProductTourStep - 1,
-                      )
-                    }
-                    onClick={() => {
-                      hideProductTour();
-                    }}
-                    positionObj={productTourDirection === 'rtl' ? '88%' : '0%'}
-                    productTourDirection={productTourDirection}
-                  />
-                ) : null}
               </Box>
             </Box>
           ) : (
@@ -482,7 +370,9 @@ export const AppHeader = ({ location }) => {
                 <PickerNetwork
                   avatarNetworkProps={{
                     backgroundColor: testNetworkBackgroundColor,
+                    role: 'img',
                   }}
+                  aria-label={`${t('networkMenu')} ${currentNetwork?.nickname}`}
                   label={currentNetwork?.nickname}
                   src={currentNetwork?.rpcPrefs?.imageUrl}
                   onClick={(e) => {
diff --git a/ui/components/multichain/app-header/app-header.test.js b/ui/components/multichain/app-header/app-header.test.js
index a760bc3e6ce9..a94c8b3f7814 100644
--- a/ui/components/multichain/app-header/app-header.test.js
+++ b/ui/components/multichain/app-header/app-header.test.js
@@ -33,7 +33,6 @@ describe('App Header', () => {
   });
 
   it('should show the copy button for multichain', () => {
-    process.env.MULTICHAIN = 1;
     const { getByTestId } = render({ send: { stage: SEND_STAGES.INACTIVE } });
     expect(getByTestId('app-header-copy-button')).toBeEnabled();
   });
diff --git a/ui/components/multichain/app-header/index.scss b/ui/components/multichain/app-header/index.scss
index e470d948c8f8..e8489694ca02 100644
--- a/ui/components/multichain/app-header/index.scss
+++ b/ui/components/multichain/app-header/index.scss
@@ -17,6 +17,9 @@
 
     @include design-system.screen-sm-max {
       height: $height-screen-sm-max;
+
+      /* Ensures network picker column and icons column are always the same size */
+      grid-template-columns: 64px 2fr 64px;
     }
 
     @include design-system.screen-sm-min {
diff --git a/ui/components/multichain/app-header/multichain-meta-fox-logo.js b/ui/components/multichain/app-header/multichain-meta-fox-logo.js
new file mode 100644
index 000000000000..e3297fecaafc
--- /dev/null
+++ b/ui/components/multichain/app-header/multichain-meta-fox-logo.js
@@ -0,0 +1,44 @@
+import React from 'react';
+///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+import { useSelector } from 'react-redux';
+///: END:ONLY_INCLUDE_IF
+import { useHistory } from 'react-router-dom';
+import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
+
+import {
+  AlignItems,
+  Display,
+  JustifyContent,
+} from '../../../helpers/constants/design-system';
+import { Box } from '../../component-library';
+///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+import { getTheme } from '../../../selectors';
+///: END:ONLY_INCLUDE_IF
+
+import Logo from '../../ui/metafox-logo';
+
+export const MultichainMetaFoxLogo = () => {
+  const history = useHistory();
+  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+  const theme = useSelector((state) => getTheme(state));
+  ///: END:ONLY_INCLUDE_IF
+
+  return (
+    <Box
+      display={[Display.None, Display.Flex]}
+      alignItems={AlignItems.center}
+      margin={2}
+      className="multichain-app-header-logo"
+      data-testid="app-header-logo"
+      justifyContent={JustifyContent.center}
+    >
+      <Logo
+        unsetIconHeight
+        onClick={async () => history.push(DEFAULT_ROUTE)}
+        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+        theme={theme}
+        ///: END:ONLY_INCLUDE_IF
+      />
+    </Box>
+  );
+};
diff --git a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js
deleted file mode 100644
index 98ad085326cd..000000000000
--- a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { Box, Icon, IconName, IconSize, Text } from '../../component-library';
-import {
-  AlignItems,
-  BorderRadius,
-  Display,
-} from '../../../helpers/constants/design-system';
-
-import { useI18nContext } from '../../../hooks/useI18nContext';
-
-export const ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES = {
-  BUY: 'buy',
-  RECEIVE: 'receive',
-  NFT: 'nft',
-};
-
-const ASSET_LIST_CONVERSION_BUTTON_VARIANTS = {
-  [ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.BUY]: {
-    color: 'var(--color-info-default)',
-    backgroundImage: 'url(/images/token-list-buy-background.png)',
-    text: 'buy',
-    icon: IconName.Add,
-  },
-  [ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.RECEIVE]: {
-    color: 'var(--color-flask-default)',
-    backgroundImage: 'url(/images/token-list-receive-background.png)',
-    text: 'receive',
-    icon: IconName.Arrow2Down,
-  },
-  [ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.NFT]: {
-    color: 'var(--color-error-alternative)',
-    backgroundImage: 'url(/images/token-list-nfts-background.png)',
-    text: 'nftLearnMore',
-    icon: IconName.Book,
-  },
-};
-
-export const AssetListConversionButton = ({ onClick, variant }) => {
-  const t = useI18nContext();
-  const { color, backgroundImage, text, icon } =
-    ASSET_LIST_CONVERSION_BUTTON_VARIANTS[variant];
-
-  return (
-    <Box
-      as="button"
-      onClick={onClick}
-      className="asset-list-conversion-button"
-      display={Display.Flex}
-      alignItems={AlignItems.center}
-      borderRadius={BorderRadius.LG}
-      style={{ backgroundImage, backgroundColor: color }}
-    >
-      <Box
-        display={Display.Flex}
-        className="asset-list-conversion-button__contents"
-      >
-        <Box
-          display={Display.Flex}
-          className="asset-list-conversion-button__contents__button-wrapper"
-          borderRadius={BorderRadius.full}
-        >
-          <Box paddingTop={1} paddingInlineStart={1}>
-            <Icon name={icon} size={IconSize.Sm} style={{ color }} />
-          </Box>
-        </Box>
-        <Text
-          className="asset-list-conversion-button__contents__text"
-          paddingInlineStart={2}
-        >
-          {t(text)}
-        </Text>
-      </Box>
-    </Box>
-  );
-};
-
-AssetListConversionButton.propTypes = {
-  /**
-   * Executes when the button is clicked
-   */
-  onClick: PropTypes.func.isRequired,
-  /**
-   * Text within the button body
-   */
-  variant: PropTypes.oneOf(
-    Object.values(ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES),
-  ),
-};
diff --git a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js b/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js
deleted file mode 100644
index b505b01ccfb4..000000000000
--- a/ui/components/multichain/asset-list-conversion-button/asset-list-conversion-button.stories.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES } from './asset-list-conversion-button';
-import { AssetListConversionButton } from '.';
-
-export default {
-  title: 'Components/Multichain/AssetListConversionButton',
-  component: AssetListConversionButton,
-  argTypes: {
-    variant: {
-      control: 'text',
-    },
-  },
-  args: {
-    variant: 'buy',
-    onClick: () => undefined,
-  },
-};
-
-export const DefaultStory = (args) => <AssetListConversionButton {...args} />;
-DefaultStory.storyName = 'Default';
-
-export const ReceiveStory = (args) => (
-  <AssetListConversionButton
-    {...args}
-    variant={ASSET_LIST_CONVERSION_BUTTON_VARIANT_TYPES.RECEIVE}
-  />
-);
-ReceiveStory.storyName = 'Receive';
diff --git a/ui/components/multichain/asset-list-conversion-button/index.js b/ui/components/multichain/asset-list-conversion-button/index.js
deleted file mode 100644
index c8c6aa20e7e7..000000000000
--- a/ui/components/multichain/asset-list-conversion-button/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { AssetListConversionButton } from './asset-list-conversion-button';
diff --git a/ui/components/multichain/asset-list-conversion-button/index.scss b/ui/components/multichain/asset-list-conversion-button/index.scss
deleted file mode 100644
index fea379efe2a5..000000000000
--- a/ui/components/multichain/asset-list-conversion-button/index.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.asset-list-conversion-button {
-  min-width: 157px;
-  height: 56px;
-  flex-grow: 1;
-
-
-  &__contents {
-    flex-grow: 1;
-
-    &__button-wrapper {
-      background: var(--brand-colors-white-white000);
-      width: 24px;
-      height: 24px;
-    }
-
-    &__text {
-      color: var(--brand-colors-white-white000);
-    }
-  }
-}
diff --git a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx
index 2a3efa169d1c..421d8b285c84 100644
--- a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx
@@ -66,6 +66,8 @@ describe('AssetBalanceText', () => {
     };
     const { asFragment } = render(
       <Provider store={store}>
+        {/* Replace `any` with type */}
+        {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
         <AssetBalanceText asset={asset} balanceColor={'textColor' as any} />
       </Provider>,
     );
@@ -91,6 +93,8 @@ describe('AssetBalanceText', () => {
     };
     const { getByText } = render(
       <Provider store={store}>
+        {/* Replace `any` with type */}
+        {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
         <AssetBalanceText asset={asset} balanceColor={'textColor' as any} />
       </Provider>,
     );
@@ -116,6 +120,8 @@ describe('AssetBalanceText', () => {
 
     const { getByText } = render(
       <Provider store={store}>
+        {/* Replace `any` with type */}
+        {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
         <AssetBalanceText asset={asset} balanceColor={'textColor' as any} />
       </Provider>,
     );
diff --git a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
index 58db7089843b..1976c367dd51 100644
--- a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
@@ -41,6 +41,8 @@ export function AssetBalanceText({
     tokens: [{ address: asset.details?.address }],
     address: undefined,
   });
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const balanceString = (tokensWithBalances[0] as any)?.string;
 
   const balanceValue = useSelector(getSelectedAccountCachedBalance);
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx
index ea993969ccfc..46743ffce15b 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx
@@ -30,6 +30,8 @@ describe('AssetPickerAmount', () => {
             asset: {
               balance: '0x3635c9adc5dea00000',
               type: AssetType.NFT,
+              // TODO: Replace `any` with type
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
               error: null as any,
               details: {
                 address: '0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e',
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
index 37e524c5ec42..79e9ff299153 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
@@ -34,7 +34,7 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import {
   getNativeCurrencyImage,
   getSelectedAccountCachedBalance,
-  getSelectedAddress,
+  getSelectedInternalAccount,
   getShouldHideZeroBalanceTokens,
 } from '../../../../selectors';
 
@@ -99,7 +99,7 @@ export function AssetPickerModal({
   onAssetChange,
 }: AssetPickerModalProps) {
   const t = useI18nContext();
-  const selectedAddress = useSelector(getSelectedAddress);
+  const { address: selectedAddress } = useSelector(getSelectedInternalAccount);
 
   const [searchQuery, setSearchQuery] = useState('');
   const [selectedToken, setSelectedToken] = useState(
@@ -177,6 +177,8 @@ export function AssetPickerModal({
   const collectionsKeys = Object.keys(collections);
 
   const collectionsData = collectionsKeys.reduce((acc: unknown[], key) => {
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const collection = (collections as any)[key];
 
     const isMatchingQuery = collection.collectionName
@@ -244,6 +246,8 @@ export function AssetPickerModal({
                   <TextFieldSearch
                     placeholder={t('searchTokenOrNFT')}
                     value={searchQuery}
+                    // TODO: Replace `any` with type
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     onChange={(e: any) => handleSearch(e.target.value)}
                     error={false}
                     autoFocus
@@ -310,6 +314,7 @@ export function AssetPickerModal({
                                 tokenSymbol={primaryCurrencyProperties.suffix}
                                 secondary={secondaryCurrencyDisplay}
                                 tokenImage={token.image}
+                                onClick={handleAssetChange(token)}
                               />
                             ) : (
                               <TokenCell
@@ -340,6 +345,8 @@ export function AssetPickerModal({
                   <TextFieldSearch
                     placeholder={t('searchTokenOrNFT')}
                     value={searchQuery}
+                    // TODO: Replace `any` with type
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     onChange={(e: any) => handleSearch(e.target.value)}
                     error={false}
                     autoFocus
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx
index 93a857e3c377..fe62996e1c7d 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx
@@ -8,7 +8,11 @@ import { AssetPicker } from './asset-picker';
 
 const store = (
   nativeTicker = 'NATIVE TICKER',
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   tokenList = {} as any,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   contractExchangeRates = {} as any,
 ) =>
   configureStore({
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index ba000ff4ec39..bbd0d3222132 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -40,6 +40,8 @@ export type AssetPickerProps = {
 export function AssetPicker({ asset, onAssetChange }: AssetPickerProps) {
   const nativeCurrencySymbol = useSelector(getNativeCurrency);
   const nativeCurrencyImageUrl = useSelector(getNativeCurrencyImage);
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const tokenList: Record<string, any> = useSelector(getTokenList);
 
   const ipfsGateway = useSelector(getIpfsGateway);
diff --git a/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts b/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
index 019d2af8eaca..392d5b210dd4 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
+++ b/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
@@ -23,8 +23,10 @@ export type ConnectAccountsListProps = {
   deselectAll: () => void;
   selectAll: () => void;
   handleAccountClick: (address: string) => void;
+  onAccountsUpdate: () => void;
   selectedAccounts: string[];
   accounts: AccountType[];
   checked: boolean;
   isIndeterminate: boolean;
+  activeTabOrigin: string;
 };
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx
index 43e83eecb607..245058d30285 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal-list.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import {
   Box,
   ButtonPrimary,
@@ -24,7 +24,6 @@ import {
   TextColor,
 } from '../../../helpers/constants/design-system';
 import Tooltip from '../../ui/tooltip/tooltip';
-import { getOriginOfCurrentTab } from '../../../selectors/selectors';
 import { getURLHost } from '../../../helpers/utils/util';
 import { addMorePermittedAccounts } from '../../../store/actions';
 import { ConnectAccountsListProps } from './connect-account-modal.types';
@@ -39,15 +38,15 @@ export const ConnectAccountsModalList: React.FC<ConnectAccountsListProps> = ({
   accounts,
   checked,
   isIndeterminate,
+  onAccountsUpdate,
+  activeTabOrigin,
 }) => {
   const t = useI18nContext();
-  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
   const dispatch = useDispatch();
   return (
     <Modal isOpen onClose={onClose} data-testid="connect-more-accounts">
       <ModalOverlay />
       <ModalContent>
-        {/* Todo: Replace this with i18 text */}
         <ModalHeader
           data-testid="connect-more-accounts-title"
           onClose={onClose}
@@ -72,11 +71,17 @@ export const ConnectAccountsModalList: React.FC<ConnectAccountsListProps> = ({
               display={Display.Flex}
             >
               <Tooltip
+                distance={10}
                 html={t('connectedAccountsListTooltip', [
                   <strong>{getURLHost(activeTabOrigin)}</strong>,
                 ])}
+                position="top"
               >
-                <Icon name={IconName.Info} color={IconColor.iconMuted} />
+                <Icon
+                  marginInlineEnd={2}
+                  name={IconName.Info}
+                  color={IconColor.iconMuted}
+                />
               </Tooltip>
               {t('permissions')}
             </Text>
@@ -88,7 +93,7 @@ export const ConnectAccountsModalList: React.FC<ConnectAccountsListProps> = ({
             return (
               <AccountListItem
                 onClick={() => handleAccountClick(account.address)}
-                identity={account}
+                account={account}
                 key={account.address}
                 closeMenu={onClose}
                 startAccessory={<Checkbox isChecked={isSelectedAccount} />}
@@ -104,9 +109,11 @@ export const ConnectAccountsModalList: React.FC<ConnectAccountsListProps> = ({
                 addMorePermittedAccounts(activeTabOrigin, selectedAccounts),
               );
               onClose();
+              onAccountsUpdate();
             }}
             size={ButtonPrimarySize.Lg}
             block
+            disabled={selectedAccounts.length === 0}
           >
             {t('confirm')}
           </ButtonPrimary>
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.stories.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.stories.tsx
index cb3448a09881..d9ab368b02c3 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.stories.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.stories.tsx
@@ -11,6 +11,7 @@ export default {
   },
   args: {
     onClose: () => ({}),
+    onAccountsUpdate: () => ({}),
     handleAccountClick: () => ({}),
     deselectAll: () => ({}),
     selectAll: () => ({}),
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx
index 725d0dd2bde6..6d386591b637 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.test.tsx
@@ -7,12 +7,14 @@ import { ConnectAccountsModalList } from './connect-accounts-modal-list';
 const render = () => {
   const props = {
     onClose: () => ({}),
+    onAccountsUpdate: () => ({}),
     handleAccountClick: () => ({}),
     deselectAll: () => ({}),
     selectAll: () => ({}),
     allAreSelected: () => false,
     checked: false,
     isIndeterminate: false,
+    activeTabOrigin: 'metamask.github.io',
     accounts: [
       {
         address: '0x5Ab19e7091dD208F352F8E727B6DCC6F8aBB6275',
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
index 91061b1c5088..bbdd39e127b0 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
@@ -3,8 +3,18 @@ import { useSelector } from 'react-redux';
 import { getUnconnectedAccounts } from '../../../selectors/selectors';
 import { ConnectAccountsModalList } from './connect-accounts-modal-list';
 
-export const ConnectAccountsModal = ({ onClose }: { onClose: () => void }) => {
-  const accounts = useSelector(getUnconnectedAccounts);
+export const ConnectAccountsModal = ({
+  onClose,
+  onAccountsUpdate,
+  activeTabOrigin,
+}: {
+  onClose: () => void;
+  onAccountsUpdate: () => void;
+  activeTabOrigin: string;
+}) => {
+  const accounts = useSelector((state) =>
+    getUnconnectedAccounts(state, activeTabOrigin),
+  );
   const [selectedAccounts, setSelectedAccounts] = useState<string[]>([]);
 
   const handleAccountClick = (address: string) => {
@@ -58,6 +68,8 @@ export const ConnectAccountsModal = ({ onClose }: { onClose: () => void }) => {
       checked={checked}
       isIndeterminate={isIndeterminate}
       onClose={onClose}
+      onAccountsUpdate={onAccountsUpdate}
+      activeTabOrigin={activeTabOrigin}
     />
   );
 };
diff --git a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx
index 86e1213cf5c5..4c81b134b28c 100644
--- a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx
+++ b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.test.tsx
@@ -4,26 +4,24 @@ import { EthAccountType, EthMethod } from '@metamask/keyring-api';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
+import { createMockInternalAccount } from '../../../../test/jest/mocks';
 import { ConnectedAccountsMenu } from '.';
 
+const mockInternalAccount = createMockInternalAccount();
+
 const DEFAULT_PROPS = {
   isOpen: true,
   onClose: jest.fn(),
-  identity: {
-    address: 'mockAddress',
-    balance: 'mockBalance',
-    id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
-    metadata: {
-      name: 'mockName',
-      keyring: {
-        type: 'HD Key Tree',
-      },
-    },
-    label: '',
+  account: {
+    ...mockInternalAccount,
+    balance: '0x123',
+    label: mockInternalAccount.metadata.name,
   },
   anchorElement: null,
   disableAccountSwitcher: false,
   closeMenu: jest.fn(),
+  onActionClick: jest.fn(),
+  activeTabOrigin: 'metamask.github.io',
 };
 
 const renderComponent = (props = {}, stateChanges = {}) => {
diff --git a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx
index 8b922be51f54..fccfc7245821 100644
--- a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx
+++ b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.tsx
@@ -20,31 +20,33 @@ import {
   removePermittedAccount,
   setSelectedAccount,
 } from '../../../store/actions';
-import {
-  getOriginOfCurrentTab,
-  getPermissionsForActiveTab,
-} from '../../../selectors';
+import { getPermissionsForActiveTab } from '../../../selectors';
 import { PermissionDetailsModal } from '../permission-details-modal/permission-details-modal';
 import { Identity } from './connected-accounts-menu.types';
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const TsMenuItem = MenuItem as any;
 
 export const ConnectedAccountsMenu = ({
   isOpen,
-  identity,
+  account,
   anchorElement,
   disableAccountSwitcher = false,
   onClose,
   closeMenu,
+  onActionClick,
+  activeTabOrigin,
 }: {
   isOpen: boolean;
-  identity: Identity;
+  account: Identity;
   anchorElement: HTMLElement | null;
   disableAccountSwitcher: boolean;
   onClose: () => void;
   closeMenu: () => void;
+  onActionClick: (message: string) => void;
+  activeTabOrigin: string;
 }) => {
-  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
   const dispatch = useDispatch();
   const t = useI18nContext();
   const popoverDialogRef = useRef<HTMLDivElement | null>(null);
@@ -119,7 +121,7 @@ export const ConnectedAccountsMenu = ({
                 iconName={IconName.SwapHorizontal}
                 data-testid="switch-account-menu-item"
                 onClick={() => {
-                  dispatch(setSelectedAccount(identity.address));
+                  dispatch(setSelectedAccount(account.address));
                   onClose();
                   closeMenu();
                 }}
@@ -134,8 +136,9 @@ export const ConnectedAccountsMenu = ({
               iconColor={IconColor.errorDefault}
               data-testid="disconnect-menu-item"
               onClick={() => {
+                onActionClick(account.metadata.name);
                 dispatch(
-                  removePermittedAccount(activeTabOrigin, identity.address),
+                  removePermittedAccount(activeTabOrigin, account.address),
                 );
               }}
             >
@@ -149,9 +152,9 @@ export const ConnectedAccountsMenu = ({
       {showPermissionModal ? (
         <PermissionDetailsModal
           isOpen={showPermissionModal}
-          account={identity}
+          account={account}
           onClick={() => {
-            dispatch(removePermittedAccount(activeTabOrigin, identity.address));
+            dispatch(removePermittedAccount(activeTabOrigin, account.address));
           }}
           onClose={() => setShowPermissionModal(false)}
           permissions={permissions}
diff --git a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts
index c1946b71b6ba..c5c28678e689 100644
--- a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts
+++ b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts
@@ -1,15 +1,11 @@
+import { InternalAccount } from '@metamask/keyring-api';
+
 export type KeyringMetadata = {
   type: string;
 };
 
-export type Identity = {
-  id: string;
-  address: string;
+export type Identity = InternalAccount & {
   balance: string;
-  metadata: {
-    name: string;
-    keyring: KeyringMetadata;
-  };
   label?: string;
 };
 
diff --git a/ui/components/multichain/connected-status/connected-status.tsx b/ui/components/multichain/connected-status/connected-status.tsx
index 00b0121b20de..83dc0c77ec45 100644
--- a/ui/components/multichain/connected-status/connected-status.tsx
+++ b/ui/components/multichain/connected-status/connected-status.tsx
@@ -5,10 +5,7 @@ import {
   BorderColor,
   Color,
 } from '../../../helpers/constants/design-system';
-import {
-  getAddressConnectedSubjectMap,
-  getOriginOfCurrentTab,
-} from '../../../selectors';
+import { isAccountConnectedToCurrentTab } from '../../../selectors';
 import {
   STATUS_CONNECTED,
   STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
@@ -22,6 +19,8 @@ export type ConnectedStatusProps = {
   isActive?: boolean;
 };
 export type AddressConnectedSubjectMap = {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [address: string]: any;
 };
 
@@ -30,14 +29,11 @@ export const ConnectedStatus: React.FC<ConnectedStatusProps> = ({
   isActive,
 }): JSX.Element => {
   const t = useI18nContext();
-  const addressConnectedSubjectMap = useSelector(
-    getAddressConnectedSubjectMap,
-  ) as AddressConnectedSubjectMap;
-  const originOfCurrentTab = useSelector(getOriginOfCurrentTab);
 
-  const selectedAddressSubjectMap = addressConnectedSubjectMap[address];
-  const currentTabIsConnectedToSelectedAddress = Boolean(
-    selectedAddressSubjectMap?.[originOfCurrentTab],
+  const currentTabIsConnectedToSelectedAddress = useSelector((state) =>
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (isAccountConnectedToCurrentTab as any)(state, address),
   );
 
   let status = STATUS_NOT_CONNECTED;
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index 186d514fc5eb..ae06d7e49642 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import {
-  CONNECTED_ROUTE,
   SETTINGS_ROUTE,
   DEFAULT_ROUTE,
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
@@ -164,12 +163,11 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
         style={{ height: '1px', borderBottomWidth: 0 }}
       ></Box>
       <MenuItem
-        iconName={IconName.Connect}
-        disabled={hasUnapprovedTransactions}
+        iconName={IconName.SecurityTick}
         onClick={() => {
-          history.push(CONNECTED_ROUTE);
+          history.push(PERMISSIONS);
           trackEvent({
-            event: MetaMetricsEventName.NavConnectedSitesOpened,
+            event: MetaMetricsEventName.NavPermissionsOpened,
             category: MetaMetricsEventCategory.Navigation,
             properties: {
               location: METRICS_LOCATION,
@@ -178,28 +176,10 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
           closeMenu();
         }}
         data-testid="global-menu-connected-sites"
+        disabled={hasUnapprovedTransactions}
       >
-        {t('connectedSites')}
+        {t('allPermissions')}
       </MenuItem>
-      {process.env.MULTICHAIN ? (
-        <MenuItem
-          iconName={IconName.SecurityTick}
-          onClick={() => {
-            history.push(PERMISSIONS);
-            trackEvent({
-              event: MetaMetricsEventName.NavPermissionsOpened,
-              category: MetaMetricsEventCategory.Navigation,
-              properties: {
-                location: METRICS_LOCATION,
-              },
-            });
-            closeMenu();
-          }}
-          data-testid="global-menu-connected-sites"
-        >
-          {t('allPermissions')}
-        </MenuItem>
-      ) : null}
 
       {
         ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
diff --git a/ui/components/multichain/global-menu/global-menu.test.js b/ui/components/multichain/global-menu/global-menu.test.js
index 8fd52cd7be11..af5ea087714b 100644
--- a/ui/components/multichain/global-menu/global-menu.test.js
+++ b/ui/components/multichain/global-menu/global-menu.test.js
@@ -28,7 +28,7 @@ jest.mock('../../../store/actions', () => ({
   setAccountDetailsAddress: () => mockSetAccountDetailsAddress,
 }));
 
-describe('AccountListItem', () => {
+describe('Global Menu', () => {
   it('locks MetaMask when item is clicked', async () => {
     render();
     fireEvent.click(document.querySelector('[data-testid="global-menu-lock"]'));
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index f585056055fc..89766f8e1287 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -7,6 +7,7 @@ export { AppHeader } from './app-header';
 export { DetectedTokensBanner } from './detected-token-banner';
 export { GlobalMenu } from './global-menu';
 export { ImportTokenLink } from './import-token-link';
+export { ReceiveTokenLink } from './receive-token-link';
 export { TokenListItem } from './token-list-item';
 export { AddressCopyButton } from './address-copy-button';
 export { ConnectedSiteMenu } from './connected-site-menu';
@@ -20,7 +21,6 @@ export { ImportAccount } from './import-account';
 export { ImportNftsModal } from './import-nfts-modal';
 export { AccountDetailsMenuItem, ViewExplorerMenuItem } from './menu-items';
 export { ImportTokensModal } from './import-tokens-modal';
-export { AssetListConversionButton } from './asset-list-conversion-button';
 export { AvatarGroup } from './avatar-group';
 export { AssetPickerAmount } from './asset-picker-amount';
 export { AddressListItem } from './address-list-item';
diff --git a/ui/components/multichain/menu-items/account-details-menu-item.js b/ui/components/multichain/menu-items/account-details-menu-item.js
index 3a2af09d1536..4cd0ae165c9c 100644
--- a/ui/components/multichain/menu-items/account-details-menu-item.js
+++ b/ui/components/multichain/menu-items/account-details-menu-item.js
@@ -30,7 +30,7 @@ export const AccountDetailsMenuItem = ({
       onClick={() => {
         dispatch(setAccountDetailsAddress(address));
         trackEvent({
-          event: MetaMetricsEventName.NavAccountDetailsOpened,
+          event: MetaMetricsEventName.AccountDetailsOpened,
           category: MetaMetricsEventCategory.Navigation,
           properties: {
             location: metricsLocation,
diff --git a/ui/components/multichain/menu-items/account-details-menu-item.test.js b/ui/components/multichain/menu-items/account-details-menu-item.test.js
index 45a57267c2ef..3f11bc9582e1 100644
--- a/ui/components/multichain/menu-items/account-details-menu-item.test.js
+++ b/ui/components/multichain/menu-items/account-details-menu-item.test.js
@@ -3,14 +3,17 @@ import { fireEvent, renderWithProvider } from '../../../../test/jest';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
 import * as actions from '../../../store/actions';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import { AccountDetailsMenuItem } from '.';
 
+const mockInternalAccount = getSelectedInternalAccountFromMockState(mockState);
+
 const render = () => {
   const store = configureStore(mockState);
   return renderWithProvider(
     <AccountDetailsMenuItem
       metricsLocation="Global Menu"
-      address={mockState.metamask.selectedAddress}
+      address={mockInternalAccount.address}
       closeMenu={jest.fn()}
     />,
     store,
@@ -32,7 +35,7 @@ describe('AccountDetailsMenuItem', () => {
     fireEvent.click(getByTestId('account-list-menu-details'));
 
     expect(actions.setAccountDetailsAddress).toHaveBeenCalledWith(
-      mockState.metamask.selectedAddress,
+      mockInternalAccount.address,
     );
   });
 });
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
index 169b7ad621f0..0fc2b0680494 100644
--- a/ui/components/multichain/multichain-components.scss
+++ b/ui/components/multichain/multichain-components.scss
@@ -23,7 +23,6 @@
 @import 'nft-item';
 @import 'badge-status';
 @import 'import-tokens-modal';
-@import 'asset-list-conversion-button';
 @import 'asset-picker-amount';
 @import 'asset-picker-amount/asset-picker';
 @import 'asset-picker-amount/asset-picker-modal';
@@ -33,3 +32,4 @@
 @import 'notification-list-item-icon';
 @import 'notification-list-item';
 @import 'toast';
+@import "ramps-card";
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.js b/ui/components/multichain/network-list-menu/network-list-menu.js
index 716a011f87d2..5d07e2cd7ddc 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.js
+++ b/ui/components/multichain/network-list-menu/network-list-menu.js
@@ -14,6 +14,7 @@ import {
   showModal,
   toggleNetworkMenu,
   updateNetworksList,
+  setNetworkClientIdForDomain,
 } from '../../../store/actions';
 import { CHAIN_IDS, TEST_CHAINS } from '../../../../shared/constants/network';
 import {
@@ -25,6 +26,8 @@ import {
   getOrderedNetworksList,
   getOnboardedInThisUISession,
   getShowNetworkBanner,
+  getOriginOfCurrentTab,
+  getUseRequestQueue,
 } from '../../../selectors';
 import ToggleButton from '../../ui/toggle-button';
 import {
@@ -71,6 +74,9 @@ export const NetworkListMenu = ({ onClose }) => {
   const showTestNetworks = useSelector(getShowTestNetworks);
   const currentChainId = useSelector(getCurrentChainId);
 
+  const selectedTabOrigin = useSelector(getOriginOfCurrentTab);
+  const useRequestQueue = useSelector(getUseRequestQueue);
+
   const dispatch = useDispatch();
   const history = useHistory();
   const trackEvent = useContext(MetaMetricsContext);
@@ -352,6 +358,17 @@ export const NetworkListMenu = ({ onClose }) => {
                                     } else {
                                       dispatch(setActiveNetwork(network.id));
                                     }
+
+                                    // If presently on a dapp, communicate a change to
+                                    // the dapp via silent switchEthereumChain that the
+                                    // network has changed due to user action
+                                    if (useRequestQueue && selectedTabOrigin) {
+                                      setNetworkClientIdForDomain(
+                                        selectedTabOrigin,
+                                        network.id,
+                                      );
+                                    }
+
                                     trackEvent({
                                       event:
                                         MetaMetricsEventName.NavNetworkSwitched,
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
index 8333ef8fbc57..83ebf8d03250 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.test.js
+++ b/ui/components/multichain/network-list-menu/network-list-menu.test.js
@@ -13,18 +13,20 @@ import { NetworkListMenu } from '.';
 const mockSetShowTestNetworks = jest.fn();
 const mockSetProviderType = jest.fn();
 const mockToggleNetworkMenu = jest.fn();
+
 jest.mock('../../../store/actions.ts', () => ({
   setShowTestNetworks: () => mockSetShowTestNetworks,
   setProviderType: () => mockSetProviderType,
   toggleNetworkMenu: () => mockToggleNetworkMenu,
 }));
 
-const render = (
+const render = ({
   showTestNetworks = false,
   currentChainId = '0x5',
   providerConfigId = 'chain5',
   isUnlocked = true,
-) => {
+  origin = 'https://portfolio.metamask.io',
+} = {}) => {
   const state = {
     metamask: {
       ...mockState.metamask,
@@ -37,6 +39,10 @@ const render = (
       preferences: {
         showTestNetworks,
       },
+      useRequestQueue: true,
+    },
+    activeTab: {
+      origin,
     },
   };
 
@@ -59,7 +65,7 @@ describe('NetworkListMenu', () => {
   });
 
   it('renders test networks when it should', () => {
-    const { getByText } = render(true);
+    const { getByText } = render({ showTestNetworks: true });
     expect(getByText(SEPOLIA_DISPLAY_NAME)).toBeInTheDocument();
   });
 
@@ -71,7 +77,7 @@ describe('NetworkListMenu', () => {
   });
 
   it('disables toggle when on test network', () => {
-    render(false, CHAIN_IDS.GOERLI);
+    render(false, { currentChainId: CHAIN_IDS.GOERLI });
     expect(document.querySelector('.toggle-button--disabled')).toBeDefined();
   });
 
@@ -84,7 +90,11 @@ describe('NetworkListMenu', () => {
 
   it('shows the correct selected network when networks share the same chain ID', () => {
     // Mainnet and Custom Mainnet RPC both use chain ID 0x1
-    render(false, CHAIN_IDS.MAINNET, 'testNetworkConfigurationId');
+    render({
+      showTestNetworks: false,
+      currentChainId: CHAIN_IDS.MAINNET,
+      providerConfigId: 'testNetworkConfigurationId',
+    });
 
     // Contains Mainnet, Linea Mainnet and the two custom networks
     const networkItems = document.querySelectorAll(
@@ -115,17 +125,17 @@ describe('NetworkListMenu', () => {
   });
 
   it('enables the "Add Network" button when MetaMask is locked', () => {
-    const { queryByText } = render(false, '0x5', 'chain5', false);
+    const { queryByText } = render({ isUnlocked: false });
     expect(queryByText('Add network')).toBeEnabled();
   });
 
   it('enables the "Add Network" button when MetaMask is true', () => {
-    const { queryByText } = render(false, '0x5', 'chain5', true);
+    const { queryByText } = render({ isUnlocked: true });
     expect(queryByText('Add network')).toBeEnabled();
   });
 
   it('does not allow deleting networks when locked', () => {
-    render(false, '0x5', 'chain5', false);
+    render({ isUnlocked: false });
     expect(
       document.querySelectorAll('multichain-network-list-item__delete'),
     ).toHaveLength(0);
diff --git a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
index ec91c6871561..1304270b10ff 100644
--- a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
+++ b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
@@ -52,30 +52,93 @@ exports[`Connections Content should render correctly 1`] = `
         class="mm-box multichain-page-content mm-box--padding-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
       >
         <div
-          class="box tabs box--flex-direction-row"
+          class="mm-box"
         >
-          <ul
-            class="box tabs__list box--display-flex box--gap-1 box--flex-direction-row box--justify-content-flex-start box--background-color-background-default"
+          <div
+            class="mm-box multichain-account-list-item multichain-account-list-item--selected mm-box--padding-4 mm-box--display-flex mm-box--background-color-primary-muted"
           >
-            <li
-              class="box tab box--flex-direction-row"
+            <div
+              class="mm-box multichain-account-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
+            />
+            <div
+              class="mm-box mm-box--display-flex mm-box--sm:display-none"
+              data-testid="account-list-item-badge"
             >
               <button
-                class="box box--padding-2 box--display-block box--flex-direction-row box--text-align-center box--width-full"
+                class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+                data-testid="multichain-badge-status"
               >
-                Connected accounts
+                <div>
+                  <div
+                    aria-describedby="tippy-tooltip-1"
+                    class=""
+                    data-original-title="Active"
+                    data-tooltipped=""
+                    style="display: inline;"
+                    tabindex="0"
+                  >
+                    <div
+                      class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+                    >
+                      <div
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      >
+                        <div
+                          class="mm-avatar-account__jazzicon"
+                        >
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+                          >
+                            <svg
+                              height="32"
+                              width="32"
+                              x="0"
+                              y="0"
+                            >
+                              <rect
+                                fill="#18CDF2"
+                                height="32"
+                                transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                                width="32"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#035E56"
+                                height="32"
+                                transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                                width="32"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#F26602"
+                                height="32"
+                                transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                                width="32"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="mm-box mm-badge-wrapper__badge-container"
+                        style="bottom: -1px; right: 2px;"
+                      >
+                        <div
+                          class="mm-box multichain-badge-status__badge mm-box--background-color-success-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                        />
+                      </div>
+                    </div>
+                  </div>
+                </div>
               </button>
-            </li>
-          </ul>
-          <div
-            class="box tabs__content box--flex-direction-row"
-          >
+            </div>
             <div
-              class="mm-box multichain-account-list-item multichain-account-list-item--selected mm-box--padding-4 mm-box--display-flex mm-box--background-color-primary-muted"
+              class="mm-box mm-box--display-none mm-box--sm:display-flex"
             >
-              <div
-                class="mm-box multichain-account-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
-              />
               <div
                 class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
               >
@@ -120,97 +183,140 @@ exports[`Connections Content should render correctly 1`] = `
                 </div>
               </div>
               <div
-                class="mm-box multichain-account-list-item__content mm-box--display-flex mm-box--flex-direction-column"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-column"
+                  class="mm-avatar-account__jazzicon"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
+                    style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
                   >
-                    <div
-                      class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
-                    >
-                      <button
-                        class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
-                      >
-                        Test Account
-                      </button>
-                    </div>
-                    <div
-                      class="mm-box mm-text multichain-account-list-item__asset mm-text--body-md mm-text--ellipsis mm-text--text-align-end mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-flex-end mm-box--align-items-center mm-box--color-text-default"
+                    <svg
+                      height="32"
+                      width="32"
+                      x="0"
+                      y="0"
                     >
-                      <div
-                        class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                        title="$880.18 USD"
-                      >
-                        <span
-                          class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                        >
-                          $880.18
-                        </span>
-                        <span
-                          class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
-                        >
-                          USD
-                        </span>
-                      </div>
-                    </div>
+                      <rect
+                        fill="#18CDF2"
+                        height="32"
+                        transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                        width="32"
+                        x="0"
+                        y="0"
+                      />
+                      <rect
+                        fill="#035E56"
+                        height="32"
+                        transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                        width="32"
+                        x="0"
+                        y="0"
+                      />
+                      <rect
+                        fill="#F26602"
+                        height="32"
+                        transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                        width="32"
+                        x="0"
+                        y="0"
+                      />
+                    </svg>
                   </div>
                 </div>
+              </div>
+            </div>
+            <div
+              class="mm-box multichain-account-list-item__content mm-box--display-flex mm-box--flex-direction-column"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-column"
+              >
                 <div
                   class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--align-items-center"
+                    class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                    <button
+                      class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
                     >
-                      0x0DCD5...3E7bc
-                    </p>
+                      Test Account
+                    </button>
                   </div>
                   <div
-                    class="mm-box multichain-account-list-item__avatar-currency mm-box--display-flex mm-box--gap-1 mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-text multichain-account-list-item__asset mm-text--body-md mm-text--ellipsis mm-text--text-align-end mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-flex-end mm-box--align-items-center mm-box--color-text-default"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-token mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+                      class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+                      title="$880.18 USD"
                     >
-                      E
+                      <span
+                        class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
+                      >
+                        $880.18
+                      </span>
+                      <span
+                        class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
+                      >
+                        USD
+                      </span>
                     </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
+              >
+                <div
+                  class="mm-box mm-box--display-flex mm-box--align-items-center"
+                >
+                  <p
+                    class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                  >
+                    0x0DCD5...3E7bc
+                  </p>
+                </div>
+                <div
+                  class="mm-box multichain-account-list-item__avatar-currency mm-box--display-flex mm-box--gap-1 mm-box--justify-content-center mm-box--align-items-center"
+                >
+                  <div
+                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-token mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+                  >
+                    E
+                  </div>
+                  <div
+                    class="mm-box mm-text mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
+                  >
                     <div
-                      class="mm-box mm-text mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
+                      class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+                      title="966.988 ETH"
                     >
-                      <div
-                        class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                        title="966.988 ETH"
+                      <span
+                        class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
                       >
-                        <span
-                          class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                        >
-                          966.988
-                        </span>
-                        <span
-                          class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
-                        >
-                          ETH
-                        </span>
-                      </div>
+                        966.988
+                      </span>
+                      <span
+                        class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
+                      >
+                        ETH
+                      </span>
                     </div>
                   </div>
                 </div>
               </div>
-              <button
-                aria-label="Test Account Options"
-                class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
-                data-testid="account-list-item-menu-button"
-              >
-                <span
-                  class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
-                  style="mask-image: url('./images/icons/more-vertical.svg');"
-                />
-              </button>
             </div>
+            <button
+              aria-label="Test Account Options"
+              class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+              data-testid="account-list-item-menu-button"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+                style="mask-image: url('./images/icons/more-vertical.svg');"
+              />
+            </button>
           </div>
         </div>
       </div>
@@ -218,27 +324,31 @@ exports[`Connections Content should render correctly 1`] = `
         class="mm-box multichain-page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
       >
         <div
-          class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
-          data-test-id="connections-button"
+          class="mm-box mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-column mm-box--width-full"
         >
-          <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
-          >
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
-              style="mask-image: url('./images/icons/add.svg');"
-            />
-            Connect more accounts
-          </button>
-          <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-button-secondary--type-danger mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-error-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-error-default box--border-style-solid box--border-width-1"
+          <div
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
+            data-test-id="connections-button"
           >
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
-              style="mask-image: url('./images/icons/logout.svg');"
-            />
-            Disconnect all accounts
-          </button>
+            <button
+              class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
+                style="mask-image: url('./images/icons/add.svg');"
+              />
+              Connect more accounts
+            </button>
+            <button
+              class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-button-secondary--type-danger mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-error-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-error-default box--border-style-solid box--border-width-1"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
+                style="mask-image: url('./images/icons/logout.svg');"
+              />
+              Disconnect all accounts
+            </button>
+          </div>
         </div>
       </div>
     </div>
diff --git a/ui/components/multichain/pages/connections/connections.test.tsx b/ui/components/multichain/pages/connections/connections.test.tsx
index 6263825fb24c..a9b37e585ae3 100644
--- a/ui/components/multichain/pages/connections/connections.test.tsx
+++ b/ui/components/multichain/pages/connections/connections.test.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import { Router, Route } from 'react-router-dom'; // Import Router and Route
+import { createMemoryHistory } from 'history';
 import {
   fireEvent,
   renderWithProvider,
@@ -86,26 +88,46 @@ describe('Connections Content', () => {
   });
 
   it('should render correctly', () => {
+    const history = createMemoryHistory();
+    history.push('/connect/https%3A%2F%2Fmetamask.github.io');
+
     const { container, getByTestId } = renderWithProvider(
-      <Connections />,
+      <Router history={history}>
+        <Route path="/connect/:origin">
+          <Connections />
+        </Route>
+      </Router>,
       connectedStore,
     );
     expect(container).toMatchSnapshot();
     expect(getByTestId('connections-page')).toBeInTheDocument();
   });
 
-  it('it should render title of the dapp correctly', () => {
-    const { getByText } = renderWithProvider(<Connections />, connectedStore);
-    expect(getByText('metamask.github.io')).toBeInTheDocument();
-  });
-
   it('it should render Disconnect all Account button of the page', () => {
-    const { getByText } = renderWithProvider(<Connections />, connectedStore);
+    const history = createMemoryHistory();
+    history.push('/connect/https%3A%2F%2Fmetamask.github.io');
+
+    const { getByText } = renderWithProvider(
+      <Router history={history}>
+        <Route path="/connect/:origin">
+          <Connections />
+        </Route>
+      </Router>,
+      connectedStore,
+    );
     expect(getByText('Disconnect all accounts')).toBeInTheDocument();
   });
+
   it('it should trigger disconnect all accounts modal flow when disconnect all accounts button is clicked', async () => {
+    const history = createMemoryHistory();
+    history.push('/connect/https%3A%2F%2Fmetamask.github.io');
+
     const { getByText, getByTestId } = renderWithProvider(
-      <Connections />,
+      <Router history={history}>
+        <Route path="/connect/:origin">
+          <Connections />
+        </Route>
+      </Router>,
       connectedStore,
     );
 
diff --git a/ui/components/multichain/pages/connections/connections.tsx b/ui/components/multichain/pages/connections/connections.tsx
index 98a05a0efdbe..6dc382288ef4 100644
--- a/ui/components/multichain/pages/connections/connections.tsx
+++ b/ui/components/multichain/pages/connections/connections.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useParams } from 'react-router-dom';
 import { NonEmptyArray } from '@metamask/utils';
 import {
   AlignItems,
@@ -13,20 +13,19 @@ import {
   TextAlign,
   TextVariant,
 } from '../../../../helpers/constants/design-system';
-import {
-  CONNECT_ROUTE,
-  DEFAULT_ROUTE,
-} from '../../../../helpers/constants/routes';
+import { CONNECT_ROUTE } from '../../../../helpers/constants/routes';
 import { getURLHost } from '../../../../helpers/utils/util';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import {
   getConnectedSitesList,
   getInternalAccounts,
-  getOrderedConnectedAccountsForActiveTab,
-  getOriginOfCurrentTab,
+  getOrderedConnectedAccountsForConnectedDapp,
   getPermissionSubjects,
   getPermittedAccountsByOrigin,
+  getPermittedAccountsForSelectedTab,
   getSelectedAccount,
+  getSubjectMetadata,
+  getUnconnectedAccounts,
 } from '../../../../selectors';
 import {
   AvatarFavicon,
@@ -44,10 +43,13 @@ import {
   IconSize,
   Text,
 } from '../../../component-library';
-import { Tab } from '../../../ui/tabs';
-import Tabs from '../../../ui/tabs/tabs.component';
 import { mergeAccounts } from '../../account-list-menu/account-list-menu';
-import { AccountListItem, AccountListItemMenuTypes } from '../..';
+import {
+  AccountListItem,
+  AccountListItemMenuTypes,
+  Toast,
+  ToastContainer,
+} from '../..';
 import { Content, Footer, Header, Page } from '../page';
 import { ConnectAccountsModal } from '../../connect-accounts-modal/connect-accounts-modal';
 import {
@@ -72,26 +74,54 @@ export const Connections = () => {
   const [showConnectAccountsModal, setShowConnectAccountsModal] =
     useState(false);
   const [showDisconnectAllModal, setShowDisconnectAllModal] = useState(false);
-  const CONNECTED_ACCOUNTS_TAB_KEY = 'connected-accounts';
-  const activeTabOrigin: string = useSelector(getOriginOfCurrentTab);
+  const [showAccountDisconnectedToast, setShowAccountDisconnectedToast] =
+    useState(''); // This is not boolean because we need the account name from the menu when a single account is disconnected
+  const [
+    showConnectedAccountsUpdatedToast,
+    setShowConnectedAccountsUpdatedToast,
+  ] = useState(false);
+  const [
+    showDisconnectedAllAccountsUpdatedToast,
+    setShowDisconnectedAllAccountsUpdatedToast,
+  ] = useState(false);
+
+  const urlParams: { origin: string } = useParams();
+  const securedOrigin = decodeURIComponent(urlParams.origin);
+
+  const activeTabOrigin: string = securedOrigin;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const subjectMetadata: { [key: string]: any } = useSelector(
     getConnectedSitesList,
   );
+  const siteMetadata = useSelector(getSubjectMetadata);
+  const connectedSiteMetadata = siteMetadata[activeTabOrigin];
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { openMetaMaskTabs } = useSelector((state: any) => state.appState);
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { id } = useSelector((state: any) => state.activeTab);
-
-  const connectedAccounts = useSelector(
-    getOrderedConnectedAccountsForActiveTab,
+  const unconnectedAccounts = useSelector((state) =>
+    getUnconnectedAccounts(state, activeTabOrigin),
+  );
+  const connectedAccounts = useSelector((state) =>
+    getOrderedConnectedAccountsForConnectedDapp(state, activeTabOrigin),
   );
   const selectedAccount = useSelector(getSelectedAccount);
   const internalAccounts = useSelector(getInternalAccounts);
   const mergedAccounts = mergeAccounts(connectedAccounts, internalAccounts);
+
   const permittedAccountsByOrigin = useSelector(
     getPermittedAccountsByOrigin,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ) as { [key: string]: any[] };
   const subjects = useSelector(getPermissionSubjects);
   const currentTabHasNoAccounts =
     !permittedAccountsByOrigin[activeTabOrigin]?.length;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let tabToConnect: { origin: any } = { origin: null };
   if (activeTabOrigin && currentTabHasNoAccounts && !openMetaMaskTabs[id]) {
     tabToConnect = {
@@ -106,6 +136,10 @@ export const Connections = () => {
   };
   const connectedSubjectsMetadata = subjectMetadata[activeTabOrigin];
 
+  const permittedAccounts = useSelector((state) =>
+    getPermittedAccountsForSelectedTab(state, activeTabOrigin),
+  );
+
   const disconnectAllAccounts = () => {
     const subject = (subjects as SubjectsType)[activeTabOrigin];
 
@@ -127,9 +161,35 @@ export const Connections = () => {
       }
 
       setShowDisconnectAllModal(false);
+      setShowDisconnectedAllAccountsUpdatedToast(true);
     }
   };
 
+  // In the mergeAccounts, we need the lastSelected value to determine which connectedAccount was last selected.
+  const latestSelected = mergedAccounts.findIndex(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (_account: any, index: any) => {
+      return (
+        index ===
+        mergedAccounts.reduce(
+          (
+            acc: string | number,
+            cur: { metadata: { lastSelected: number } },
+            // TODO: Replace `any` with type
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            i: any,
+          ) =>
+            cur.metadata.lastSelected >
+            mergedAccounts[acc].metadata.lastSelected
+              ? i
+              : acc,
+          0,
+        )
+      );
+    },
+  );
+
   return (
     <Page data-testid="connections-page" className="connections-page">
       <Header
@@ -140,7 +200,8 @@ export const Connections = () => {
             iconName={IconName.ArrowLeft}
             className="connections-header__start-accessory"
             color={IconColor.iconDefault}
-            onClick={() => history.push(DEFAULT_ROUTE)}
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            onClick={() => (history as any).goBack()}
             size={ButtonIconSize.Sm}
           />
         }
@@ -171,53 +232,54 @@ export const Connections = () => {
             textAlign={TextAlign.Center}
             ellipsis
           >
-            {getURLHost(activeTabOrigin)}
+            {getURLHost(securedOrigin)}
           </Text>
         </Box>
       </Header>
       <Content padding={0}>
-        {connectedSubjectsMetadata && mergeAccounts.length > 0 ? (
-          <Tabs defaultActiveTabKey="connections">
-            {
-              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-              // @ts-ignore
-              <Tab
-                tabKey={CONNECTED_ACCOUNTS_TAB_KEY}
-                name={t('connectedaccountsTabKey')}
-                padding={4}
-              >
-                {mergedAccounts.map((account: AccountType) => {
-                  const connectedSites: ConnectedSites = {};
-
-                  const connectedSite = connectedSites[account.address]?.find(
-                    ({ origin }) => origin === activeTabOrigin,
-                  );
-                  // Since this list renders only connected accounts, selected account will be the active account
-                  const isSelectedAccount =
-                    selectedAccount.address === account.address;
-                  return (
-                    <AccountListItem
-                      identity={account}
-                      key={account.address}
-                      accountsCount={mergedAccounts.length}
-                      selected={isSelectedAccount}
-                      connectedAvatar={connectedSite?.iconUrl}
-                      connectedAvatarName={connectedSite?.name}
-                      menuType={AccountListItemMenuTypes.Connection}
-                      currentTabOrigin={activeTabOrigin}
-                      isActive={isSelectedAccount ? t('active') : null}
-                    />
-                  );
-                })}
-              </Tab>
-            }
-          </Tabs>
+        {permittedAccounts.length > 0 && mergeAccounts.length > 0 ? (
+          <Box>
+            {/* TODO: Replace `any` with type */}
+            {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
+            {mergedAccounts.map((account: AccountType, index: any) => {
+              const connectedSites: ConnectedSites = {};
+              const connectedSite = connectedSites[account.address]?.find(
+                ({ origin }) => origin === activeTabOrigin,
+              );
+              const isSelectedAccount =
+                selectedAccount.address === account.address;
+              // Match the index of latestSelected Account with the index of all the accounts and set the active status
+              let mergedAccountsProps;
+              if (index === latestSelected) {
+                mergedAccountsProps = { ...account, isAccountActive: true };
+              } else {
+                mergedAccountsProps = { ...account };
+              }
+              return (
+                <AccountListItem
+                  account={mergedAccountsProps}
+                  key={account.address}
+                  accountsCount={mergedAccounts.length}
+                  selected={isSelectedAccount}
+                  connectedAvatar={connectedSite?.iconUrl}
+                  menuType={AccountListItemMenuTypes.Connection}
+                  currentTabOrigin={activeTabOrigin}
+                  isActive={
+                    mergedAccountsProps.isAccountActive ? t('active') : null
+                  }
+                  onActionClick={setShowAccountDisconnectedToast}
+                />
+              );
+            })}
+          </Box>
         ) : (
           <NoConnectionContent />
         )}
         {showConnectAccountsModal ? (
           <ConnectAccountsModal
             onClose={() => setShowConnectAccountsModal(false)}
+            onAccountsUpdate={() => setShowConnectedAccountsUpdatedToast(true)}
+            activeTabOrigin={activeTabOrigin}
           />
         ) : null}
         {showDisconnectAllModal ? (
@@ -230,44 +292,104 @@ export const Connections = () => {
         ) : null}
       </Content>
       <Footer>
-        {connectedSubjectsMetadata && mergeAccounts.length > 0 ? (
-          <Box
-            display={Display.Flex}
-            gap={2}
-            flexDirection={FlexDirection.Column}
-            width={BlockSize.Full}
-            data-test-id="connections-button"
-          >
-            <Button
-              size={ButtonSize.Lg}
-              block
-              variant={ButtonVariant.Secondary}
-              startIconName={IconName.Add}
-              onClick={() => setShowConnectAccountsModal(true)}
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          width={BlockSize.Full}
+          gap={4}
+        >
+          {showConnectedAccountsUpdatedToast ? (
+            <ToastContainer>
+              <Toast
+                text={t('connectedAccountsToast')}
+                onClose={() => setShowConnectedAccountsUpdatedToast(false)}
+                startAdornment={
+                  <AvatarFavicon
+                    name={connectedSubjectsMetadata?.name}
+                    size={AvatarFaviconSize.Sm}
+                    src={connectedSubjectsMetadata?.iconUrl}
+                  />
+                }
+              />
+            </ToastContainer>
+          ) : null}
+          {showDisconnectedAllAccountsUpdatedToast ? (
+            <ToastContainer>
+              <Toast
+                text={t('disconnectedAllAccountsToast', [
+                  getURLHost(activeTabOrigin),
+                ])}
+                onClose={() =>
+                  setShowDisconnectedAllAccountsUpdatedToast(false)
+                }
+                startAdornment={
+                  <AvatarFavicon
+                    name={connectedSiteMetadata?.name}
+                    size={AvatarFaviconSize.Sm}
+                    src={connectedSiteMetadata?.iconUrl}
+                  />
+                }
+              />
+            </ToastContainer>
+          ) : null}
+          {showAccountDisconnectedToast.length > 0 ? (
+            <ToastContainer>
+              <Toast
+                text={t('disconnectedSingleAccountToast', [
+                  showAccountDisconnectedToast,
+                  getURLHost(activeTabOrigin),
+                ])}
+                onClose={() => setShowAccountDisconnectedToast('')}
+                startAdornment={
+                  <AvatarFavicon
+                    name={connectedSiteMetadata?.name}
+                    size={AvatarFaviconSize.Sm}
+                    src={connectedSiteMetadata?.iconUrl}
+                  />
+                }
+              />
+            </ToastContainer>
+          ) : null}
+          {permittedAccounts.length > 0 && mergeAccounts.length > 0 ? (
+            <Box
+              display={Display.Flex}
+              gap={2}
+              flexDirection={FlexDirection.Column}
+              width={BlockSize.Full}
+              data-test-id="connections-button"
             >
-              {t('connectMoreAccounts')}
-            </Button>
-            <Button
-              size={ButtonSize.Lg}
+              <Button
+                size={ButtonSize.Lg}
+                block
+                variant={ButtonVariant.Secondary}
+                disabled={unconnectedAccounts.length === 0}
+                startIconName={IconName.Add}
+                onClick={() => setShowConnectAccountsModal(true)}
+              >
+                {t('connectMoreAccounts')}
+              </Button>
+              <Button
+                size={ButtonSize.Lg}
+                block
+                variant={ButtonVariant.Secondary}
+                startIconName={IconName.Logout}
+                danger
+                onClick={() => setShowDisconnectAllModal(true)}
+              >
+                {t('disconnectAllAccounts')}
+              </Button>
+            </Box>
+          ) : (
+            <ButtonPrimary
+              size={ButtonPrimarySize.Lg}
               block
-              variant={ButtonVariant.Secondary}
-              startIconName={IconName.Logout}
-              danger
-              onClick={() => setShowDisconnectAllModal(true)}
+              data-test-id="no-connections-button"
+              onClick={() => dispatch(requestAccountsPermission())}
             >
-              {t('disconnectAllAccounts')}
-            </Button>
-          </Box>
-        ) : (
-          <ButtonPrimary
-            size={ButtonPrimarySize.Lg}
-            block
-            data-test-id="no-connections-button"
-            onClick={() => dispatch(requestAccountsPermission())}
-          >
-            {t('connectAccounts')}
-          </ButtonPrimary>
-        )}
+              {t('connectAccounts')}
+            </ButtonPrimary>
+          )}
+        </Box>
       </Footer>
     </Page>
   );
diff --git a/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap b/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap
index baf6e9450ad6..5f262171ce12 100644
--- a/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap
+++ b/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap
@@ -41,19 +41,13 @@ exports[`All Connections render renders correctly 1`] = `
         </div>
       </div>
       <div
-        class="mm-box multichain-page-content mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
+        class="mm-box multichain-page-content mm-box--padding-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
       >
         <div
           class="mm-box"
         />
-        <p
-          class="mm-box mm-text mm-text--body-lg-medium mm-text--text-align-center mm-box--padding-4 mm-box--color-text-default mm-box--background-color-background-default"
-          data-testid="sites-connections"
-        >
-          Site Connections
-        </p>
         <button
-          class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
+          class="mm-box multichain-connection-list-item mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
           data-testid="connection-list-item"
         >
           <div
@@ -183,165 +177,6 @@ exports[`All Connections render renders correctly 1`] = `
             />
           </div>
         </button>
-        <p
-          class="mm-box mm-text mm-text--body-lg-medium mm-text--text-align-center mm-box--padding-4 mm-box--color-text-default mm-box--background-color-background-default"
-          data-testid="snaps-connections"
-        >
-          Snap Connections
-        </p>
-        <button
-          class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
-          data-testid="connection-list-item"
-        >
-          <div
-            class="mm-box mm-box--display-flex mm-box--align-items-center"
-            style="align-self: center;"
-          >
-            <div
-              class="mm-box mm-badge-wrapper snap-avatar connection-list-item__snap-avatar mm-box--display-inline-block"
-            >
-              <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
-                style="border-width: 0px;"
-              >
-                m
-              </div>
-              <div
-                class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-bottom-right"
-              >
-                <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-icon mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-info-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-0 box--border-style-solid box--border-width-1"
-                >
-                  <span
-                    class="mm-box mm-icon mm-icon--size-xs mm-box--display-inline-block mm-box--color-info-inverse"
-                    style="mask-image: url('./images/icons/snaps.svg');"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-5/12"
-            style="align-self: center; flex-grow: 1;"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-text--text-align-left mm-box--color-text-default"
-            >
-              @metamask/testSnap1
-            </p>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--justify-content-flex-end mm-box--align-items-center"
-            style="flex: 1; align-self: center;"
-          >
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--display-flex mm-box--color-icon-default mm-box--background-color-background-default"
-              style="mask-image: url('./images/icons/arrow-right.svg');"
-            />
-          </div>
-        </button>
-        <button
-          class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
-          data-testid="connection-list-item"
-        >
-          <div
-            class="mm-box mm-box--display-flex mm-box--align-items-center"
-            style="align-self: center;"
-          >
-            <div
-              class="mm-box mm-badge-wrapper snap-avatar connection-list-item__snap-avatar mm-box--display-inline-block"
-            >
-              <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
-                style="border-width: 0px;"
-              >
-                m
-              </div>
-              <div
-                class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-bottom-right"
-              >
-                <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-icon mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-info-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-0 box--border-style-solid box--border-width-1"
-                >
-                  <span
-                    class="mm-box mm-icon mm-icon--size-xs mm-box--display-inline-block mm-box--color-info-inverse"
-                    style="mask-image: url('./images/icons/snaps.svg');"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-5/12"
-            style="align-self: center; flex-grow: 1;"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-text--text-align-left mm-box--color-text-default"
-            >
-              @metamask/testSnap2
-            </p>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--justify-content-flex-end mm-box--align-items-center"
-            style="flex: 1; align-self: center;"
-          >
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--display-flex mm-box--color-icon-default mm-box--background-color-background-default"
-              style="mask-image: url('./images/icons/arrow-right.svg');"
-            />
-          </div>
-        </button>
-        <button
-          class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
-          data-testid="connection-list-item"
-        >
-          <div
-            class="mm-box mm-box--display-flex mm-box--align-items-center"
-            style="align-self: center;"
-          >
-            <div
-              class="mm-box mm-badge-wrapper snap-avatar connection-list-item__snap-avatar mm-box--display-inline-block"
-            >
-              <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
-                style="border-width: 0px;"
-              >
-                m
-              </div>
-              <div
-                class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-bottom-right"
-              >
-                <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-icon mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-info-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-0 box--border-style-solid box--border-width-1"
-                >
-                  <span
-                    class="mm-box mm-icon mm-icon--size-xs mm-box--display-inline-block mm-box--color-info-inverse"
-                    style="mask-image: url('./images/icons/snaps.svg');"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-5/12"
-            style="align-self: center; flex-grow: 1;"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-text--text-align-left mm-box--color-text-default"
-            >
-              @metamask/testSnap3
-            </p>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--justify-content-flex-end mm-box--align-items-center"
-            style="flex: 1; align-self: center;"
-          >
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--display-flex mm-box--color-icon-default mm-box--background-color-background-default"
-              style="mask-image: url('./images/icons/arrow-right.svg');"
-            />
-          </div>
-        </button>
       </div>
     </div>
   </div>
diff --git a/ui/components/multichain/pages/permissions-page/connection-list-item.js b/ui/components/multichain/pages/permissions-page/connection-list-item.js
index 95b9cafd5a7e..8d06e7b2b59c 100644
--- a/ui/components/multichain/pages/permissions-page/connection-list-item.js
+++ b/ui/components/multichain/pages/permissions-page/connection-list-item.js
@@ -27,6 +27,7 @@ import {
 } from '../../../component-library';
 import { getURLHost } from '../../../../helpers/utils/util';
 import SnapAvatar from '../../../app/snaps/snap-avatar/snap-avatar';
+import { getAvatarNetworkColor } from '../../../../helpers/utils/accounts';
 import { ConnectionListTooltip } from './connection-list-tooltip/connection-list-tooltip';
 
 export const ConnectionListItem = ({ connection, onClick }) => {
@@ -45,6 +46,7 @@ export const ConnectionListItem = ({ connection, onClick }) => {
       onClick={onClick}
       padding={4}
       gap={4}
+      className="multichain-connection-list-item"
     >
       <Box
         display={Display.Flex}
@@ -69,6 +71,7 @@ export const ConnectionListItem = ({ connection, onClick }) => {
                 src={connection.networkIconUrl}
                 borderWidth={1}
                 borderColor={BackgroundColor.backgroundDefault}
+                backgroundColor={getAvatarNetworkColor(connection.networkName)}
               />
             }
           >
diff --git a/ui/components/multichain/pages/permissions-page/connection-list-item.scss b/ui/components/multichain/pages/permissions-page/connection-list-item.scss
new file mode 100644
index 000000000000..3a529b279014
--- /dev/null
+++ b/ui/components/multichain/pages/permissions-page/connection-list-item.scss
@@ -0,0 +1,7 @@
+.multichain-connection-list-item {
+  &:hover,
+  &:focus-within,
+  &:active {
+    background-color: var(--color-background-default-hover);
+  }
+}
diff --git a/ui/components/multichain/pages/permissions-page/index.scss b/ui/components/multichain/pages/permissions-page/index.scss
new file mode 100644
index 000000000000..8e1aeddb5f07
--- /dev/null
+++ b/ui/components/multichain/pages/permissions-page/index.scss
@@ -0,0 +1,2 @@
+@import './connection-list-item';
+@import './permissions-page';
diff --git a/ui/components/multichain/pages/permissions-page/permissions-page.js b/ui/components/multichain/pages/permissions-page/permissions-page.js
index 56d33cce9fba..2b2691c5c210 100644
--- a/ui/components/multichain/pages/permissions-page/permissions-page.js
+++ b/ui/components/multichain/pages/permissions-page/permissions-page.js
@@ -1,5 +1,5 @@
 import classnames from 'classnames';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import { Content, Header, Page } from '../page';
@@ -30,16 +30,11 @@ import {
   getOnboardedInThisUISession,
   getShowPermissionsTour,
   getConnectedSitesListWithNetworkInfo,
-  getConnectedSnapsList,
 } from '../../../../selectors';
-import { Tab, Tabs } from '../../../ui/tabs';
 import { ProductTour } from '../../product-tour-popover';
-import { getURLHost } from '../../../../helpers/utils/util';
 import { hidePermissionsTour } from '../../../../store/actions';
 import { ConnectionListItem } from './connection-list-item';
 
-const TABS_THRESHOLD = 5;
-
 export const PermissionsPage = () => {
   const t = useI18nContext();
   const history = useHistory();
@@ -48,27 +43,15 @@ export const PermissionsPage = () => {
   const sitesConnectionsList = useSelector(
     getConnectedSitesListWithNetworkInfo,
   );
-  const snapsConnectionsList = useSelector(getConnectedSnapsList);
   const showPermissionsTour = useSelector(getShowPermissionsTour);
   const onboardedInThisUISession = useSelector(getOnboardedInThisUISession);
 
   useEffect(() => {
-    setTotalConnections(
-      Object.keys(sitesConnectionsList).length +
-        Object.keys(snapsConnectionsList).length,
-    );
-  }, [sitesConnectionsList, snapsConnectionsList]);
-
-  const shouldShowTabsView = useMemo(() => {
-    return (
-      totalConnections > TABS_THRESHOLD &&
-      Object.keys(sitesConnectionsList).length > 0 &&
-      Object.keys(snapsConnectionsList).length > 0
-    );
-  }, [totalConnections, sitesConnectionsList, snapsConnectionsList]);
+    setTotalConnections(Object.keys(sitesConnectionsList).length);
+  }, [sitesConnectionsList]);
 
   const handleConnectionClick = (connection) => {
-    const hostName = getURLHost(connection.origin);
+    const hostName = connection.origin;
     const safeEncodedHost = encodeURIComponent(hostName);
     history.push(`${CONNECTIONS}/${safeEncodedHost}`);
   };
@@ -122,58 +105,11 @@ export const PermissionsPage = () => {
           positionObj="44%"
         />
       ) : null}
-      <Content>
+      <Content padding={0}>
         <Box ref={headerRef}></Box>
-        {shouldShowTabsView ? (
-          <Tabs tabsClassName="permissions-page__tabs">
-            <Tab
-              data-testid="permissions-page-sites-tab"
-              name={t('sites')}
-              tabKey="sites"
-            >
-              {renderConnectionsList(sitesConnectionsList)}
-            </Tab>
-            <Tab
-              data-testid="permissions-page-snaps-tab"
-              name={t('snaps')}
-              tabKey="snaps"
-            >
-              {renderConnectionsList(snapsConnectionsList)}
-            </Tab>
-          </Tabs>
+        {totalConnections > 0 ? (
+          renderConnectionsList(sitesConnectionsList)
         ) : (
-          <>
-            {Object.keys(sitesConnectionsList).length > 0 && (
-              <>
-                <Text
-                  data-testid="sites-connections"
-                  backgroundColor={BackgroundColor.backgroundDefault}
-                  variant={TextVariant.bodyLgMedium}
-                  textAlign={TextAlign.Center}
-                  padding={4}
-                >
-                  {t('siteConnections')}
-                </Text>
-                {renderConnectionsList(sitesConnectionsList)}
-              </>
-            )}
-            {Object.keys(snapsConnectionsList).length > 0 && (
-              <>
-                <Text
-                  data-testid="snaps-connections"
-                  variant={TextVariant.bodyLgMedium}
-                  backgroundColor={BackgroundColor.backgroundDefault}
-                  textAlign={TextAlign.Center}
-                  padding={4}
-                >
-                  {t('snapConnections')}
-                </Text>
-                {renderConnectionsList(snapsConnectionsList)}
-              </>
-            )}
-          </>
-        )}
-        {totalConnections === 0 ? (
           <Box
             data-testid="no-connections"
             display={Display.Flex}
@@ -198,7 +134,7 @@ export const PermissionsPage = () => {
               {t('permissionsPageEmptySubContent')}
             </Text>
           </Box>
-        ) : null}
+        )}
       </Content>
     </Page>
   );
diff --git a/ui/components/multichain/pages/permissions-page/permissions-page.test.js b/ui/components/multichain/pages/permissions-page/permissions-page.test.js
index 1440f8c389c8..dacdda2f25d3 100644
--- a/ui/components/multichain/pages/permissions-page/permissions-page.test.js
+++ b/ui/components/multichain/pages/permissions-page/permissions-page.test.js
@@ -100,52 +100,6 @@ describe('All Connections', () => {
       expect(getByTestId('permissions-page')).toBeInTheDocument();
     });
 
-    it('renders sections when user has 5 or less connections', () => {
-      const { getByTestId } = renderWithProvider(<PermissionsPage />, store);
-      expect(getByTestId('sites-connections')).toBeInTheDocument();
-      expect(getByTestId('snaps-connections')).toBeInTheDocument();
-    });
-
-    it('renders tabs when user has more than 5 connections', () => {
-      mockState.metamask.snaps = {
-        ...mockState.metamask.snaps,
-        'npm:@metamask/testSnap4': {
-          id: 'npm:@metamask/testSnap4',
-          origin: 'npm:@metamask/testSnap4',
-          version: '5.1.2',
-          iconUrl: null,
-          initialPermissions: {
-            'endowment:ethereum-provider': {},
-          },
-        },
-        'npm:@metamask/testSnap5': {
-          id: 'npm:@metamask/testSnap5',
-          origin: 'npm:@metamask/testSnap5',
-          version: '5.1.2',
-          iconUrl: null,
-          initialPermissions: {
-            'endowment:ethereum-provider': {},
-          },
-        },
-      };
-      mockState.metamask.subjectMetadata = {
-        ...mockState.metamask.subjectMetadata,
-        'npm:@metamask/testSnap4': {
-          name: 'Test Snap 4',
-          version: '1.2.3',
-          subjectType: 'snap',
-        },
-        'npm:@metamask/testSnap5': {
-          name: 'Test Snap 5',
-          version: '1.2.3',
-          subjectType: 'snap',
-        },
-      };
-      store = configureStore(mockState);
-      const { getByTestId } = renderWithProvider(<PermissionsPage />, store);
-      expect(getByTestId('permissions-page-sites-tab')).toBeInTheDocument();
-      expect(getByTestId('permissions-page-snaps-tab')).toBeInTheDocument();
-    });
     it('renders no connections message when user has no connections', () => {
       mockState.metamask.snaps = {};
       mockState.metamask.subjectMetadata = {};
diff --git a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
index e609037a05ed..6ec9491dbfca 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -54,6 +54,49 @@ exports[`SendPage render and initialization should render correctly even when a
             <span
               class="mm-box mm-text mm-text--inherit mm-text--ellipsis mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--width-full mm-box--color-text-default"
             >
+              <div
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default 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: 16px; height: 16px; display: inline-block; background: rgb(24, 151, 242);"
+                  >
+                    <svg
+                      height="16"
+                      width="16"
+                      x="0"
+                      y="0"
+                    >
+                      <rect
+                        fill="#2362E1"
+                        height="16"
+                        transform="translate(1.7946650923962586 -2.667155311616761) rotate(458.4 8 8)"
+                        width="16"
+                        x="0"
+                        y="0"
+                      />
+                      <rect
+                        fill="#F94301"
+                        height="16"
+                        transform="translate(-7.681729644825104 3.9961758177433153) rotate(268.8 8 8)"
+                        width="16"
+                        x="0"
+                        y="0"
+                      />
+                      <rect
+                        fill="#FA7900"
+                        height="16"
+                        transform="translate(-4.538127039650711 14.740007940341687) rotate(117.3 8 8)"
+                        width="16"
+                        x="0"
+                        y="0"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
               <div
                 class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
               >
@@ -182,48 +225,171 @@ exports[`SendPage render and initialization should render correctly even when a
                 class="mm-box mm-box--padding-bottom-6 mm-box--display-flex mm-box--flex-direction-column"
               >
                 <div
-                  class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+                  class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class="mm-box mm-box--display-flex mm-box--sm:display-none"
+                    data-testid="account-list-item-badge"
+                  >
+                    <button
+                      class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+                      data-testid="multichain-badge-status"
+                    >
+                      <div>
+                        <div
+                          aria-describedby="tippy-tooltip-2"
+                          class=""
+                          data-original-title="Not connected"
+                          data-tooltipped=""
+                          style="display: inline;"
+                          tabindex="0"
+                        >
+                          <div
+                            class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+                          >
+                            <div
+                              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            >
+                              <div
+                                class="mm-avatar-account__jazzicon"
+                              >
+                                <div
+                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 151, 242);"
+                                >
+                                  <svg
+                                    height="32"
+                                    width="32"
+                                    x="0"
+                                    y="0"
+                                  >
+                                    <rect
+                                      fill="#2362E1"
+                                      height="32"
+                                      transform="translate(3.589330184792517 -5.334310623233522) rotate(458.4 16 16)"
+                                      width="32"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#F94301"
+                                      height="32"
+                                      transform="translate(-15.363459289650208 7.992351635486631) rotate(268.8 16 16)"
+                                      width="32"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#FA7900"
+                                      height="32"
+                                      transform="translate(-9.076254079301423 29.480015880683375) rotate(117.3 16 16)"
+                                      width="32"
+                                      x="0"
+                                      y="0"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                            <div
+                              class="mm-box mm-badge-wrapper__badge-container"
+                              style="bottom: -1px; right: 2px;"
+                            >
+                              <div
+                                class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </button>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-none mm-box--sm:display-flex"
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                     >
                       <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 151, 242);"
+                        class="mm-avatar-account__jazzicon"
                       >
-                        <svg
-                          height="32"
-                          width="32"
-                          x="0"
-                          y="0"
+                        <div
+                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 151, 242);"
                         >
-                          <rect
-                            fill="#2362E1"
+                          <svg
                             height="32"
-                            transform="translate(3.589330184792517 -5.334310623233522) rotate(458.4 16 16)"
                             width="32"
                             x="0"
                             y="0"
-                          />
-                          <rect
-                            fill="#F94301"
-                            height="32"
-                            transform="translate(-15.363459289650208 7.992351635486631) rotate(268.8 16 16)"
-                            width="32"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#FA7900"
+                          >
+                            <rect
+                              fill="#2362E1"
+                              height="32"
+                              transform="translate(3.589330184792517 -5.334310623233522) rotate(458.4 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#F94301"
+                              height="32"
+                              transform="translate(-15.363459289650208 7.992351635486631) rotate(268.8 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#FA7900"
+                              height="32"
+                              transform="translate(-9.076254079301423 29.480015880683375) rotate(117.3 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    >
+                      <div
+                        class="mm-avatar-account__jazzicon"
+                      >
+                        <div
+                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 151, 242);"
+                        >
+                          <svg
                             height="32"
-                            transform="translate(-9.076254079301423 29.480015880683375) rotate(117.3 16 16)"
                             width="32"
                             x="0"
                             y="0"
-                          />
-                        </svg>
+                          >
+                            <rect
+                              fill="#2362E1"
+                              height="32"
+                              transform="translate(3.589330184792517 -5.334310623233522) rotate(458.4 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#F94301"
+                              height="32"
+                              transform="translate(-15.363459289650208 7.992351635486631) rotate(268.8 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#FA7900"
+                              height="32"
+                              transform="translate(-9.076254079301423 29.480015880683375) rotate(117.3 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
diff --git a/ui/components/multichain/pages/send/components/__snapshots__/account-picker.test.tsx.snap b/ui/components/multichain/pages/send/components/__snapshots__/account-picker.test.tsx.snap
index 2bdac5bdc680..e028e9267b92 100644
--- a/ui/components/multichain/pages/send/components/__snapshots__/account-picker.test.tsx.snap
+++ b/ui/components/multichain/pages/send/components/__snapshots__/account-picker.test.tsx.snap
@@ -18,6 +18,49 @@ exports[`SendPageAccountPicker render renders correctly 1`] = `
       <span
         class="mm-box mm-text mm-text--inherit mm-text--ellipsis mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--width-full mm-box--color-text-default"
       >
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default 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: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
+            >
+              <svg
+                height="16"
+                width="16"
+                x="0"
+                y="0"
+              >
+                <rect
+                  fill="#18CDF2"
+                  height="16"
+                  transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
+                  width="16"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#035E56"
+                  height="16"
+                  transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
+                  width="16"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F26602"
+                  height="16"
+                  transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
+                  width="16"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
         <div
           class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
         >
diff --git a/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap b/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap
index 9af03636a18d..605c375472ce 100644
--- a/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap
+++ b/ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap
@@ -6,48 +6,171 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
     class="mm-box mm-box--padding-bottom-6 mm-box--display-flex mm-box--flex-direction-column"
   >
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-box--display-flex mm-box--sm:display-none"
+        data-testid="account-list-item-badge"
+      >
+        <button
+          class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+          data-testid="multichain-badge-status"
+        >
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-1"
+              class=""
+              data-original-title="Not connected"
+              data-tooltipped=""
+              style="display: inline;"
+              tabindex="0"
+            >
+              <div
+                class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+              >
+                <div
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                >
+                  <div
+                    class="mm-avatar-account__jazzicon"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+                    >
+                      <svg
+                        height="32"
+                        width="32"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#18CDF2"
+                          height="32"
+                          transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#035E56"
+                          height="32"
+                          transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#F26602"
+                          height="32"
+                          transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box mm-badge-wrapper__badge-container"
+                  style="bottom: -1px; right: 2px;"
+                >
+                  <div
+                    class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mm-box mm-box--display-none mm-box--sm:display-flex"
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
         >
           <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+            class="mm-avatar-account__jazzicon"
           >
-            <svg
-              height="32"
-              width="32"
-              x="0"
-              y="0"
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
             >
-              <rect
-                fill="#18CDF2"
-                height="32"
-                transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
-                width="32"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#035E56"
+              <svg
                 height="32"
-                transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-              <rect
-                fill="#F26602"
+              >
+                <rect
+                  fill="#18CDF2"
+                  height="32"
+                  transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#035E56"
+                  height="32"
+                  transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F26602"
+                  height="32"
+                  transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          <div
+            class="mm-avatar-account__jazzicon"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+            >
+              <svg
                 height="32"
-                transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-            </svg>
+              >
+                <rect
+                  fill="#18CDF2"
+                  height="32"
+                  transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#035E56"
+                  height="32"
+                  transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F26602"
+                  height="32"
+                  transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </div>
@@ -134,48 +257,171 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-box--display-flex mm-box--sm:display-none"
+        data-testid="account-list-item-badge"
+      >
+        <button
+          class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+          data-testid="multichain-badge-status"
+        >
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-2"
+              class=""
+              data-original-title="Not connected"
+              data-tooltipped=""
+              style="display: inline;"
+              tabindex="0"
+            >
+              <div
+                class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+              >
+                <div
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                >
+                  <div
+                    class="mm-avatar-account__jazzicon"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(245, 143, 0);"
+                    >
+                      <svg
+                        height="32"
+                        width="32"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#018E74"
+                          height="32"
+                          transform="translate(6.3132478822336004 -5.428280652507946) rotate(358.4 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#18CAF2"
+                          height="32"
+                          transform="translate(7.685615565022901 -12.13837331367715) rotate(414.8 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#C81474"
+                          height="32"
+                          transform="translate(-5.608908748503153 -25.081111298235626) rotate(322.3 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box mm-badge-wrapper__badge-container"
+                  style="bottom: -1px; right: 2px;"
+                >
+                  <div
+                    class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mm-box mm-box--display-none mm-box--sm:display-flex"
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
         >
           <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(245, 143, 0);"
+            class="mm-avatar-account__jazzicon"
           >
-            <svg
-              height="32"
-              width="32"
-              x="0"
-              y="0"
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(245, 143, 0);"
             >
-              <rect
-                fill="#018E74"
-                height="32"
-                transform="translate(6.3132478822336004 -5.428280652507946) rotate(358.4 16 16)"
-                width="32"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#18CAF2"
+              <svg
                 height="32"
-                transform="translate(7.685615565022901 -12.13837331367715) rotate(414.8 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-              <rect
-                fill="#C81474"
+              >
+                <rect
+                  fill="#018E74"
+                  height="32"
+                  transform="translate(6.3132478822336004 -5.428280652507946) rotate(358.4 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#18CAF2"
+                  height="32"
+                  transform="translate(7.685615565022901 -12.13837331367715) rotate(414.8 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#C81474"
+                  height="32"
+                  transform="translate(-5.608908748503153 -25.081111298235626) rotate(322.3 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          <div
+            class="mm-avatar-account__jazzicon"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(245, 143, 0);"
+            >
+              <svg
                 height="32"
-                transform="translate(-5.608908748503153 -25.081111298235626) rotate(322.3 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-            </svg>
+              >
+                <rect
+                  fill="#018E74"
+                  height="32"
+                  transform="translate(6.3132478822336004 -5.428280652507946) rotate(358.4 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#18CAF2"
+                  height="32"
+                  transform="translate(7.685615565022901 -12.13837331367715) rotate(414.8 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#C81474"
+                  height="32"
+                  transform="translate(-5.608908748503153 -25.081111298235626) rotate(322.3 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </div>
@@ -262,48 +508,171 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-box--display-flex mm-box--sm:display-none"
+        data-testid="account-list-item-badge"
+      >
+        <button
+          class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+          data-testid="multichain-badge-status"
+        >
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-3"
+              class=""
+              data-original-title="Not connected"
+              data-tooltipped=""
+              style="display: inline;"
+              tabindex="0"
+            >
+              <div
+                class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+              >
+                <div
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                >
+                  <div
+                    class="mm-avatar-account__jazzicon"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(249, 100, 1);"
+                    >
+                      <svg
+                        height="32"
+                        width="32"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#C81432"
+                          height="32"
+                          transform="translate(-0.583645999400264 -3.1039565032560605) rotate(331.7 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#187AF2"
+                          height="32"
+                          transform="translate(-12.717635568312648 6.331674609038503) rotate(160.5 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#FB183E"
+                          height="32"
+                          transform="translate(28.6680862233552 -2.984235702254764) rotate(517.6 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box mm-badge-wrapper__badge-container"
+                  style="bottom: -1px; right: 2px;"
+                >
+                  <div
+                    class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mm-box mm-box--display-none mm-box--sm:display-flex"
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
         >
           <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(249, 100, 1);"
+            class="mm-avatar-account__jazzicon"
           >
-            <svg
-              height="32"
-              width="32"
-              x="0"
-              y="0"
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(249, 100, 1);"
             >
-              <rect
-                fill="#C81432"
+              <svg
                 height="32"
-                transform="translate(-0.583645999400264 -3.1039565032560605) rotate(331.7 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-              <rect
-                fill="#187AF2"
-                height="32"
-                transform="translate(-12.717635568312648 6.331674609038503) rotate(160.5 16 16)"
-                width="32"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#FB183E"
+              >
+                <rect
+                  fill="#C81432"
+                  height="32"
+                  transform="translate(-0.583645999400264 -3.1039565032560605) rotate(331.7 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#187AF2"
+                  height="32"
+                  transform="translate(-12.717635568312648 6.331674609038503) rotate(160.5 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#FB183E"
+                  height="32"
+                  transform="translate(28.6680862233552 -2.984235702254764) rotate(517.6 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          <div
+            class="mm-avatar-account__jazzicon"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(249, 100, 1);"
+            >
+              <svg
                 height="32"
-                transform="translate(28.6680862233552 -2.984235702254764) rotate(517.6 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-            </svg>
+              >
+                <rect
+                  fill="#C81432"
+                  height="32"
+                  transform="translate(-0.583645999400264 -3.1039565032560605) rotate(331.7 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#187AF2"
+                  height="32"
+                  transform="translate(-12.717635568312648 6.331674609038503) rotate(160.5 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#FB183E"
+                  height="32"
+                  transform="translate(28.6680862233552 -2.984235702254764) rotate(517.6 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </div>
@@ -399,48 +768,171 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-box--display-flex mm-box--sm:display-none"
+        data-testid="account-list-item-badge"
+      >
+        <button
+          class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+          data-testid="multichain-badge-status"
+        >
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-4"
+              class=""
+              data-original-title="Not connected"
+              data-tooltipped=""
+              style="display: inline;"
+              tabindex="0"
+            >
+              <div
+                class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+              >
+                <div
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                >
+                  <div
+                    class="mm-avatar-account__jazzicon"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(242, 206, 2);"
+                    >
+                      <svg
+                        height="32"
+                        width="32"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#2340E1"
+                          height="32"
+                          transform="translate(-1.9490904468166024 -1.0214651118866318) rotate(257.0 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#016D8E"
+                          height="32"
+                          transform="translate(12.81547793667531 3.042947044480663) rotate(77.0 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#F5F500"
+                          height="32"
+                          transform="translate(13.127605578158805 -22.247335466025433) rotate(465.0 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box mm-badge-wrapper__badge-container"
+                  style="bottom: -1px; right: 2px;"
+                >
+                  <div
+                    class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mm-box mm-box--display-none mm-box--sm:display-flex"
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
         >
           <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(242, 206, 2);"
+            class="mm-avatar-account__jazzicon"
           >
-            <svg
-              height="32"
-              width="32"
-              x="0"
-              y="0"
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(242, 206, 2);"
             >
-              <rect
-                fill="#2340E1"
-                height="32"
-                transform="translate(-1.9490904468166024 -1.0214651118866318) rotate(257.0 16 16)"
-                width="32"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#016D8E"
+              <svg
                 height="32"
-                transform="translate(12.81547793667531 3.042947044480663) rotate(77.0 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-              <rect
-                fill="#F5F500"
+              >
+                <rect
+                  fill="#2340E1"
+                  height="32"
+                  transform="translate(-1.9490904468166024 -1.0214651118866318) rotate(257.0 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#016D8E"
+                  height="32"
+                  transform="translate(12.81547793667531 3.042947044480663) rotate(77.0 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F5F500"
+                  height="32"
+                  transform="translate(13.127605578158805 -22.247335466025433) rotate(465.0 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          <div
+            class="mm-avatar-account__jazzicon"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(242, 206, 2);"
+            >
+              <svg
                 height="32"
-                transform="translate(13.127605578158805 -22.247335466025433) rotate(465.0 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-            </svg>
+              >
+                <rect
+                  fill="#2340E1"
+                  height="32"
+                  transform="translate(-1.9490904468166024 -1.0214651118866318) rotate(257.0 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#016D8E"
+                  height="32"
+                  transform="translate(12.81547793667531 3.042947044480663) rotate(77.0 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F5F500"
+                  height="32"
+                  transform="translate(13.127605578158805 -22.247335466025433) rotate(465.0 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </div>
@@ -527,48 +1019,171 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-box--display-flex mm-box--sm:display-none"
+        data-testid="account-list-item-badge"
+      >
+        <button
+          class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+          data-testid="multichain-badge-status"
+        >
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-5"
+              class=""
+              data-original-title="Not connected"
+              data-tooltipped=""
+              style="display: inline;"
+              tabindex="0"
+            >
+              <div
+                class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+              >
+                <div
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                >
+                  <div
+                    class="mm-avatar-account__jazzicon"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 125, 242);"
+                    >
+                      <svg
+                        height="32"
+                        width="32"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#C81435"
+                          height="32"
+                          transform="translate(-2.119319732745029 -1.8856543404847388) rotate(249.5 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#F5E400"
+                          height="32"
+                          transform="translate(-1.5132951940983728 12.006291365578917) rotate(269.5 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#F96001"
+                          height="32"
+                          transform="translate(7.578094081568198 24.82791748135462) rotate(216.3 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box mm-badge-wrapper__badge-container"
+                  style="bottom: -1px; right: 2px;"
+                >
+                  <div
+                    class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mm-box mm-box--display-none mm-box--sm:display-flex"
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
         >
           <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 125, 242);"
+            class="mm-avatar-account__jazzicon"
           >
-            <svg
-              height="32"
-              width="32"
-              x="0"
-              y="0"
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 125, 242);"
             >
-              <rect
-                fill="#C81435"
-                height="32"
-                transform="translate(-2.119319732745029 -1.8856543404847388) rotate(249.5 16 16)"
-                width="32"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#F5E400"
+              <svg
                 height="32"
-                transform="translate(-1.5132951940983728 12.006291365578917) rotate(269.5 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-              <rect
-                fill="#F96001"
+              >
+                <rect
+                  fill="#C81435"
+                  height="32"
+                  transform="translate(-2.119319732745029 -1.8856543404847388) rotate(249.5 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F5E400"
+                  height="32"
+                  transform="translate(-1.5132951940983728 12.006291365578917) rotate(269.5 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F96001"
+                  height="32"
+                  transform="translate(7.578094081568198 24.82791748135462) rotate(216.3 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          <div
+            class="mm-avatar-account__jazzicon"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 125, 242);"
+            >
+              <svg
                 height="32"
-                transform="translate(7.578094081568198 24.82791748135462) rotate(216.3 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-            </svg>
+              >
+                <rect
+                  fill="#C81435"
+                  height="32"
+                  transform="translate(-2.119319732745029 -1.8856543404847388) rotate(249.5 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F5E400"
+                  height="32"
+                  transform="translate(-1.5132951940983728 12.006291365578917) rotate(269.5 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F96001"
+                  height="32"
+                  transform="translate(7.578094081568198 24.82791748135462) rotate(216.3 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </div>
@@ -668,48 +1283,171 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
       </div>
     </div>
     <div
-      class="mm-box multichain-account-list-item mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
+      class="mm-box multichain-account-list-item multichain-account-list-item--clickable mm-box--padding-4 mm-box--display-flex mm-box--background-color-transparent"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-box--display-flex mm-box--sm:display-none"
+        data-testid="account-list-item-badge"
+      >
+        <button
+          class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+          data-testid="multichain-badge-status"
+        >
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-6"
+              class=""
+              data-original-title="Not connected"
+              data-tooltipped=""
+              style="display: inline;"
+              tabindex="0"
+            >
+              <div
+                class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+              >
+                <div
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                >
+                  <div
+                    class="mm-avatar-account__jazzicon"
+                  >
+                    <div
+                      style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 62, 0);"
+                    >
+                      <svg
+                        height="32"
+                        width="32"
+                        x="0"
+                        y="0"
+                      >
+                        <rect
+                          fill="#238FE1"
+                          height="32"
+                          transform="translate(-4.225116043000625 4.953154575894918) rotate(161.9 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#FB1891"
+                          height="32"
+                          transform="translate(-4.425829304725563 12.962271707551116) rotate(224.3 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                        <rect
+                          fill="#F90901"
+                          height="32"
+                          transform="translate(-26.833286698037487 -15.298402889891959) rotate(344.7 16 16)"
+                          width="32"
+                          x="0"
+                          y="0"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box mm-badge-wrapper__badge-container"
+                  style="bottom: -1px; right: 2px;"
+                >
+                  <div
+                    class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </button>
+      </div>
+      <div
+        class="mm-box mm-box--display-none mm-box--sm:display-flex"
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
         >
           <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 62, 0);"
+            class="mm-avatar-account__jazzicon"
           >
-            <svg
-              height="32"
-              width="32"
-              x="0"
-              y="0"
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 62, 0);"
             >
-              <rect
-                fill="#238FE1"
+              <svg
                 height="32"
-                transform="translate(-4.225116043000625 4.953154575894918) rotate(161.9 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-              <rect
-                fill="#FB1891"
-                height="32"
-                transform="translate(-4.425829304725563 12.962271707551116) rotate(224.3 16 16)"
-                width="32"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#F90901"
+              >
+                <rect
+                  fill="#238FE1"
+                  height="32"
+                  transform="translate(-4.225116043000625 4.953154575894918) rotate(161.9 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#FB1891"
+                  height="32"
+                  transform="translate(-4.425829304725563 12.962271707551116) rotate(224.3 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F90901"
+                  height="32"
+                  transform="translate(-26.833286698037487 -15.298402889891959) rotate(344.7 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          <div
+            class="mm-avatar-account__jazzicon"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 62, 0);"
+            >
+              <svg
                 height="32"
-                transform="translate(-26.833286698037487 -15.298402889891959) rotate(344.7 16 16)"
                 width="32"
                 x="0"
                 y="0"
-              />
-            </svg>
+              >
+                <rect
+                  fill="#238FE1"
+                  height="32"
+                  transform="translate(-4.225116043000625 4.953154575894918) rotate(161.9 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#FB1891"
+                  height="32"
+                  transform="translate(-4.425829304725563 12.962271707551116) rotate(224.3 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#F90901"
+                  height="32"
+                  transform="translate(-26.833286698037487 -15.298402889891959) rotate(344.7 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
           </div>
         </div>
       </div>
diff --git a/ui/components/multichain/pages/send/components/content.tsx b/ui/components/multichain/pages/send/components/content.tsx
index 43e05d92a893..4d2fd0debb42 100644
--- a/ui/components/multichain/pages/send/components/content.tsx
+++ b/ui/components/multichain/pages/send/components/content.tsx
@@ -50,13 +50,15 @@ export const SendPageContent = ({
   // Gas data
   const dispatch = useDispatch();
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const handleSelectToken = async (token: any) => {
     if (token.type === AssetType.native) {
       dispatch(
         updateSendAsset({
           type: token.type,
           details: token,
-          skipComputeEstimatedGasLimit: true,
+          skipComputeEstimatedGasLimit: false,
         }),
       );
     } else {
@@ -67,7 +69,7 @@ export const SendPageContent = ({
             ...token,
             standard: token.standard ?? TokenStandard.ERC20,
           },
-          skipComputeEstimatedGasLimit: true,
+          skipComputeEstimatedGasLimit: false,
         }),
       );
     }
diff --git a/ui/components/multichain/pages/send/components/hex.tsx b/ui/components/multichain/pages/send/components/hex.tsx
index 36e000372f68..af6b002ce173 100644
--- a/ui/components/multichain/pages/send/components/hex.tsx
+++ b/ui/components/multichain/pages/send/components/hex.tsx
@@ -16,6 +16,8 @@ export const SendHexData = () => {
     <SendPageRow>
       <Label>{t('hexData')}</Label>
       <Textarea
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         onInput={(event: any) => {
           const newData = event.target.value.replace(/\n/gu, '') || null;
           dispatch(updateSendHexData(newData ?? ''));
diff --git a/ui/components/multichain/pages/send/components/recipient.tsx b/ui/components/multichain/pages/send/components/recipient.tsx
index abe210cfa3fa..943aea6c11dc 100644
--- a/ui/components/multichain/pages/send/components/recipient.tsx
+++ b/ui/components/multichain/pages/send/components/recipient.tsx
@@ -30,6 +30,8 @@ const renderExplicitAddress = (
   address: string,
   nickname: string,
   type: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   dispatch: any,
 ) => {
   return (
diff --git a/ui/components/multichain/pages/send/components/your-accounts.tsx b/ui/components/multichain/pages/send/components/your-accounts.tsx
index d247e11b9b49..40a47c628aca 100644
--- a/ui/components/multichain/pages/send/components/your-accounts.tsx
+++ b/ui/components/multichain/pages/send/components/your-accounts.tsx
@@ -23,9 +23,11 @@ export const SendPageYourAccounts = () => {
 
   return (
     <SendPageRow>
+      {/* TODO: Replace `any` with type */}
+      {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
       {mergedAccounts.map((account: any) => (
         <AccountListItem
-          identity={account}
+          account={account}
           key={account.address}
           isPinned={Boolean(account.pinned)}
           onClick={() => {
diff --git a/ui/components/multichain/pages/send/send.test.js b/ui/components/multichain/pages/send/send.test.js
index 2cefaf0b4ae2..e1a059f33626 100644
--- a/ui/components/multichain/pages/send/send.test.js
+++ b/ui/components/multichain/pages/send/send.test.js
@@ -126,7 +126,6 @@ const baseStore = {
         gasEstimateType: GasEstimateTypes.legacy,
       },
     },
-    selectedAddress: '0x0',
     internalAccounts: {
       accounts: {
         'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -195,7 +194,6 @@ const baseStore = {
     accounts: {
       '0x0': { balance: '0x0', address: '0x0', name: 'Account 1' },
     },
-    identities: { '0x0': { address: '0x0' } },
     tokenAddress: '0x32e6c34cd57087abbd59b5a4aecc4cb495924356',
     tokenList: {
       '0x32e6c34cd57087abbd59b5a4aecc4cb495924356': {
diff --git a/ui/components/multichain/permission-details-modal/permission-details-modal.tsx b/ui/components/multichain/permission-details-modal/permission-details-modal.tsx
index 726923de0a32..06699a60650c 100644
--- a/ui/components/multichain/permission-details-modal/permission-details-modal.tsx
+++ b/ui/components/multichain/permission-details-modal/permission-details-modal.tsx
@@ -101,6 +101,8 @@ export const PermissionDetailsModal = ({
               description={permission.description}
               weight={permission.weight}
               avatarIcon={permission.leftIcon}
+              // TODO: Replace `any` with type
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
               dateApproved={(permission?.permissionValue as any).date}
               key={`${permission.permissionName}-${index}`}
             />
diff --git a/ui/components/multichain/ramps-card/index.js b/ui/components/multichain/ramps-card/index.js
new file mode 100644
index 000000000000..5f005f38a1c5
--- /dev/null
+++ b/ui/components/multichain/ramps-card/index.js
@@ -0,0 +1 @@
+export { RampsCard } from './ramps-card';
diff --git a/ui/components/multichain/ramps-card/index.scss b/ui/components/multichain/ramps-card/index.scss
new file mode 100644
index 000000000000..a394311eeda9
--- /dev/null
+++ b/ui/components/multichain/ramps-card/index.scss
@@ -0,0 +1,30 @@
+.ramps-card {
+  padding: 8px 12px;
+
+  &__cta-button {
+    width: fit-content;
+    color: var(--brand-colors-grey-grey800);
+    background-color: var(--brand-colors-white-white000);
+  }
+
+  &__title {
+    color: var(--brand-colors-white-white000);
+  }
+
+  &__body {
+    color: var(--brand-colors-white-white000);
+    width: 80%;
+  }
+}
+
+.ramps-card-token {
+  background-color: var(--color-info-default);
+}
+
+.ramps-card-nft {
+  background-color: var(--color-flask-default);
+}
+
+.ramps-card-activity {
+  background-color: var(--color-error-alternative);
+}
diff --git a/ui/components/multichain/ramps-card/ramps-card.js b/ui/components/multichain/ramps-card/ramps-card.js
new file mode 100644
index 000000000000..9b1956ac6b7d
--- /dev/null
+++ b/ui/components/multichain/ramps-card/ramps-card.js
@@ -0,0 +1,127 @@
+import React, { useCallback, useContext, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import classnames from 'classnames';
+import { Box, Text, ButtonBase } from '../../component-library';
+import {
+  BorderRadius,
+  Display,
+  FlexDirection,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getCurrentNetwork, getSwapsDefaultToken } from '../../../selectors';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import useRamps, {
+  RampsMetaMaskEntry,
+} from '../../../hooks/experiences/useRamps';
+import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
+import { getCurrentLocale } from '../../../ducks/locale/locale';
+
+const darkenGradient =
+  'linear-gradient(rgba(0, 0, 0, 0.12),rgba(0, 0, 0, 0.12))';
+
+export const RAMPS_CARD_VARIANT_TYPES = {
+  TOKEN: 'token',
+  NFT: 'nft',
+  ACTIVITY: 'activity',
+};
+
+export const RAMPS_CARD_VARIANTS = {
+  [RAMPS_CARD_VARIANT_TYPES.TOKEN]: {
+    illustrationSrc: './images/ramps-card-token-illustration.png',
+    gradient:
+      'linear-gradient(90deg, #0189EC 0%, #4B7AED 35%, #6774EE 58%, #706AF4 80.5%, #7C5BFC 100%)',
+    title: 'fundYourWallet',
+    body: 'fundYourWalletDescription',
+  },
+  [RAMPS_CARD_VARIANT_TYPES.NFT]: {
+    illustrationSrc: './images/ramps-card-nft-illustration.png',
+    gradient: 'linear-gradient(90deg, #F6822D 0%, #F894A7 52%, #ED94FB 92.5%)',
+    title: 'getStartedWithNFTs',
+    body: 'getStartedWithNFTsDescription',
+  },
+  [RAMPS_CARD_VARIANT_TYPES.ACTIVITY]: {
+    illustrationSrc: './images/ramps-card-activity-illustration.png',
+    gradient:
+      'linear-gradient(90deg, #57C5DC 0%, #06BFDD 49.39%, #35A9C7 100%)',
+
+    title: 'startYourJourney',
+    body: 'startYourJourneyDescription',
+  },
+};
+
+const metamaskEntryMap = {
+  [RAMPS_CARD_VARIANT_TYPES.TOKEN]: RampsMetaMaskEntry.TokensBanner,
+  [RAMPS_CARD_VARIANT_TYPES.NFT]: RampsMetaMaskEntry.NftBanner,
+  [RAMPS_CARD_VARIANT_TYPES.ACTIVITY]: RampsMetaMaskEntry.ActivityBanner,
+};
+
+export const RampsCard = ({ variant }) => {
+  const t = useI18nContext();
+  const { gradient, illustrationSrc, title, body } =
+    RAMPS_CARD_VARIANTS[variant];
+  const { openBuyCryptoInPdapp } = useRamps(metamaskEntryMap[variant]);
+  const trackEvent = useContext(MetaMetricsContext);
+  const currentLocale = useSelector(getCurrentLocale);
+  const { chainId, nickname } = useSelector(getCurrentNetwork);
+  const { symbol = 'ETH' } = useSelector(getSwapsDefaultToken);
+
+  useEffect(() => {
+    trackEvent({
+      event: MetaMetricsEventName.EmptyBuyBannerDisplayed,
+      category: MetaMetricsEventCategory.Navigation,
+      properties: {
+        chain_id: chainId,
+        locale: currentLocale,
+        network: nickname,
+        referrer: ORIGIN_METAMASK,
+      },
+    });
+  }, [currentLocale, chainId, nickname, trackEvent]);
+
+  const onClick = useCallback(() => {
+    openBuyCryptoInPdapp();
+    trackEvent({
+      event: MetaMetricsEventName.NavBuyButtonClicked,
+      category: MetaMetricsEventCategory.Navigation,
+      properties: {
+        location: `${variant} tab`,
+        text: `Buy ${symbol}`,
+        chain_id: chainId,
+        token_symbol: symbol,
+      },
+    });
+  }, [chainId, openBuyCryptoInPdapp, symbol, trackEvent, variant]);
+
+  return (
+    <Box
+      className={classnames('ramps-card', `ramps-card-${variant}`)}
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      gap={2}
+      borderRadius={BorderRadius.LG}
+      margin={2}
+      style={{
+        background: `url(${illustrationSrc}) no-repeat right bottom / contain,
+            ${darkenGradient}, ${gradient}`,
+      }}
+    >
+      <Text className="ramps-card__title" variant={TextVariant.headingSm}>
+        {t(title, [symbol])}
+      </Text>
+      <Text className="ramps-card__body">{t(body, [symbol])}</Text>
+      <ButtonBase className="ramps-card__cta-button" onClick={onClick}>
+        {t('buyToken', [symbol])}
+      </ButtonBase>
+    </Box>
+  );
+};
+
+RampsCard.propTypes = {
+  variant: PropTypes.oneOf(Object.values(RAMPS_CARD_VARIANT_TYPES)),
+};
diff --git a/ui/components/multichain/ramps-card/ramps-card.stories.js b/ui/components/multichain/ramps-card/ramps-card.stories.js
new file mode 100644
index 000000000000..b280e63591d8
--- /dev/null
+++ b/ui/components/multichain/ramps-card/ramps-card.stories.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import { RAMPS_CARD_VARIANT_TYPES } from './ramps-card';
+import { RampsCard } from '.';
+
+export default {
+  title: 'Components/Multichain/RampsCard',
+  component: RampsCard,
+  argTypes: {
+    variant: {
+      control: 'text',
+    },
+  },
+  args: {
+    variant: RAMPS_CARD_VARIANT_TYPES.TOKEN,
+  },
+};
+
+export const DefaultStory = (args) => <RampsCard {...args} />;
+DefaultStory.storyName = 'Default';
+
+export const TokensStory = (args) => (
+  <RampsCard {...args} variant={RAMPS_CARD_VARIANT_TYPES.TOKEN} />
+);
+
+TokensStory.storyName = 'Tokens';
+
+export const NFTsStory = (args) => (
+  <RampsCard {...args} variant={RAMPS_CARD_VARIANT_TYPES.NFT} />
+);
+
+NFTsStory.storyName = 'NFTs';
+
+export const ActivityStory = (args) => (
+  <RampsCard {...args} variant={RAMPS_CARD_VARIANT_TYPES.ACTIVITY} />
+);
+
+ActivityStory.storyName = 'Activity';
diff --git a/ui/components/multichain/receive-modal/receive-modal.js b/ui/components/multichain/receive-modal/receive-modal.js
index 3d5bb2746856..8fe57cc9de5a 100644
--- a/ui/components/multichain/receive-modal/receive-modal.js
+++ b/ui/components/multichain/receive-modal/receive-modal.js
@@ -61,11 +61,12 @@ export const ReceiveModal = ({ address, onClose }) => {
         >
           {name}
         </Text>
-
         <Box
           display={Display.Flex}
           alignItems={AlignItems.center}
           flexDirection={FlexDirection.Column}
+          paddingInlineEnd={4}
+          paddingInlineStart={4}
         >
           <QrCodeView Qr={{ data: address }} />
         </Box>
diff --git a/ui/components/multichain/receive-token-link/index.ts b/ui/components/multichain/receive-token-link/index.ts
new file mode 100644
index 000000000000..f9f98f23d8d3
--- /dev/null
+++ b/ui/components/multichain/receive-token-link/index.ts
@@ -0,0 +1 @@
+export { ReceiveTokenLink } from './receive-token-link';
diff --git a/ui/components/multichain/receive-token-link/receive-token-link.tsx b/ui/components/multichain/receive-token-link/receive-token-link.tsx
new file mode 100644
index 000000000000..fa8079238b0f
--- /dev/null
+++ b/ui/components/multichain/receive-token-link/receive-token-link.tsx
@@ -0,0 +1,67 @@
+import React, { useContext, useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import type { BoxProps } from '../../component-library';
+import {
+  Box,
+  ButtonLink,
+  ButtonLinkSize,
+  IconName,
+} from '../../component-library';
+import { AlignItems, Display } from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { getCurrentNetwork, getSelectedAccount } from '../../../selectors';
+import { ReceiveModal } from '../receive-modal';
+import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
+import { getCurrentLocale } from '../../../ducks/locale/locale';
+
+export const ReceiveTokenLink: React.FC<BoxProps<'div'>> = ({
+  ...props
+}): JSX.Element => {
+  const trackEvent = useContext(MetaMetricsContext);
+  const t = useI18nContext();
+  const currentNetwork = useSelector(getCurrentNetwork);
+  const currentLocale = useSelector(getCurrentLocale);
+  const { address: selectedAddress } = useSelector(getSelectedAccount);
+
+  const [showReceiveModal, setShowReceiveModal] = useState(false);
+
+  useEffect(() => {
+    trackEvent({
+      event: MetaMetricsEventName.EmptyReceiveBannerDisplayed,
+      category: MetaMetricsEventCategory.Navigation,
+      properties: {
+        chain_id: currentNetwork.chainId,
+        locale: currentLocale,
+        network: currentNetwork.nickname,
+        referrer: ORIGIN_METAMASK,
+      },
+    });
+  }, []);
+
+  return (
+    <>
+      {showReceiveModal && (
+        <ReceiveModal
+          address={selectedAddress}
+          onClose={() => setShowReceiveModal(false)}
+        />
+      )}
+      <Box display={Display.Flex} alignItems={AlignItems.center} {...props}>
+        <ButtonLink
+          size={ButtonLinkSize.Md}
+          startIconName={IconName.Add}
+          onClick={() => {
+            setShowReceiveModal(true);
+          }}
+        >
+          {t('receiveTokensCamelCase')}
+        </ButtonLink>
+      </Box>
+    </>
+  );
+};
diff --git a/ui/components/multichain/toast/toast.stories.tsx b/ui/components/multichain/toast/toast.stories.tsx
index f027f932f9b4..40d3b69eccd6 100644
--- a/ui/components/multichain/toast/toast.stories.tsx
+++ b/ui/components/multichain/toast/toast.stories.tsx
@@ -4,10 +4,12 @@ import { AvatarAccount, AvatarAccountSize } from '../../component-library';
 import { BorderColor } from '../../../helpers/constants/design-system';
 import { Toast } from '.';
 
-const [chaosAddress] = Object.keys(testData.metamask.identities);
+const [chaosAccount] = Object.values(
+  testData.metamask.internalAccounts.accounts,
+);
 
-const CHAOS_IDENTITY = {
-  ...testData.metamask.identities[chaosAddress],
+const CHAOS_ACCOUNT = {
+  ...chaosAccount,
   balance: '0x152387ad22c3f0',
   keyring: {
     type: 'HD Key Tree',
@@ -34,11 +36,13 @@ export default {
     },
   },
   args: {
-    startAdornment: (<AvatarAccount
-    address={CHAOS_IDENTITY.address}
-    size={AvatarAccountSize.Md}
-    borderColor={BorderColor.transparent}
-  />),
+    startAdornment: (
+      <AvatarAccount
+        address={CHAOS_ACCOUNT.address}
+        size={AvatarAccountSize.Md}
+        borderColor={BorderColor.transparent}
+      />
+    ),
     text: 'This is the Toast text',
     actionText: 'Take some action',
     onActionClick: () => undefined,
diff --git a/ui/components/multichain/toast/toast.test.tsx b/ui/components/multichain/toast/toast.test.tsx
index 8b00be1817e2..d1541587694e 100644
--- a/ui/components/multichain/toast/toast.test.tsx
+++ b/ui/components/multichain/toast/toast.test.tsx
@@ -1,13 +1,17 @@
 /* eslint-disable jest/require-top-level-describe */
 import React from 'react';
 import { fireEvent, render } from '@testing-library/react';
-import testData from '../../../../.storybook/test-data';
+import { InternalAccount } from '@metamask/keyring-api';
 import { AvatarAccount, AvatarAccountSize } from '../../component-library';
 import { BorderColor } from '../../../helpers/constants/design-system';
+import { createMockInternalAccount } from '../../../../test/jest/mocks';
 import { Toast } from '.';
 
-const CHAOS_IDENTITY: any = {
-  ...testData.metamask.identities['0x64a845a5b02460acf8a3d84503b0d68d028b4bb4'],
+const mockInternalAccount = createMockInternalAccount();
+
+const CHAOS_ACCOUNT: InternalAccount = {
+  ...mockInternalAccount,
+  address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
   balance: '0x152387ad22c3f0',
   keyring: {
     type: 'HD Key Tree',
@@ -20,7 +24,7 @@ const onClose = jest.fn();
 const ToastArgs = {
   startAdornment: (
     <AvatarAccount
-      address={CHAOS_IDENTITY.address}
+      address={CHAOS_ACCOUNT.address}
       size={AvatarAccountSize.Md}
       borderColor={BorderColor.transparent}
     />
diff --git a/ui/components/multichain/toast/toast.tsx b/ui/components/multichain/toast/toast.tsx
index 622a58bd813d..45f60d7a8087 100644
--- a/ui/components/multichain/toast/toast.tsx
+++ b/ui/components/multichain/toast/toast.tsx
@@ -18,8 +18,8 @@ export const Toast = ({
 }: {
   startAdornment: React.ReactNode | React.ReactNode[];
   text: string;
-  actionText: string;
-  onActionClick: () => void;
+  actionText?: string;
+  onActionClick?: () => void;
   onClose: () => void;
 }) => {
   const { theme } = document.documentElement.dataset;
diff --git a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
index 767d276c97e6..cf114c75da11 100644
--- a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
+++ b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
@@ -46,27 +46,18 @@ exports[`TokenListItem should render correctly 1`] = `
             <span
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
             />
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
-            data-testid="multichain-token-list-item-secondary-value"
-          />
-        </div>
-        <div
-          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
-        >
-          <div
-            class="mm-box mm-box--width-1/3"
-          >
             <p
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-alternative"
               data-testid="multichain-token-list-item-token-name"
             />
           </div>
           <div
-            class="mm-box mm-box--width-2/3"
-            style="overflow: hidden;"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
           >
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
+              data-testid="multichain-token-list-item-secondary-value"
+            />
             <p
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-alternative"
               data-testid="multichain-token-list-item-value"
@@ -75,6 +66,9 @@ exports[`TokenListItem should render correctly 1`] = `
             </p>
           </div>
         </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
+        />
       </div>
     </a>
   </div>
diff --git a/ui/components/multichain/token-list-item/token-list-item.js b/ui/components/multichain/token-list-item/token-list-item.js
index bfaaafa82e86..aa29a2a755c1 100644
--- a/ui/components/multichain/token-list-item/token-list-item.js
+++ b/ui/components/multichain/token-list-item/token-list-item.js
@@ -39,6 +39,7 @@ import {
   getCurrentNetwork,
   getMetaMetricsId,
   getNativeCurrencyImage,
+  getPreferences,
   getTestNetworkBackgroundColor,
 } from '../../../selectors';
 import Tooltip from '../../ui/tooltip';
@@ -77,10 +78,12 @@ export const TokenListItem = ({
 
   // Scam warning
   const showScamWarning = isNativeCurrency && !isOriginalTokenSymbol;
+
   const dispatch = useDispatch();
   const [showScamWarningModal, setShowScamWarningModal] = useState(false);
   const environmentType = getEnvironmentType();
   const providerConfig = useSelector(getProviderConfig);
+  const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
   const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
   const history = useHistory();
 
@@ -244,31 +247,87 @@ export const TokenListItem = ({
                   )}
                 </Text>
               )}
+              <Text
+                fontWeight={FontWeight.Medium}
+                variant={TextVariant.bodyMd}
+                color={TextColor.textAlternative}
+                data-testid="multichain-token-list-item-token-name" //
+                ellipsis
+              >
+                {tokenTitle}
+              </Text>
             </Box>
 
             {showScamWarning ? (
-              <ButtonIcon
-                iconName={IconName.Danger}
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  setShowScamWarningModal(true);
-                }}
-                color={IconColor.errorDefault}
-                size={IconSize.Lg}
-                backgroundColor={BackgroundColor.transparent}
-              />
+              <Box
+                display={Display.Flex}
+                flexDirection={FlexDirection.Column}
+                width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
+                alignItems={AlignItems.flexEnd}
+              >
+                <ButtonIcon
+                  iconName={IconName.Danger}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    setShowScamWarningModal(true);
+                  }}
+                  color={IconColor.errorDefault}
+                  size={IconSize.Md}
+                  backgroundColor={BackgroundColor.transparent}
+                  data-testid="scam-warning"
+                />
+
+                {useNativeCurrencyAsPrimaryCurrency ? (
+                  <Text
+                    fontWeight={FontWeight.Medium}
+                    variant={TextVariant.bodyMd}
+                    width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
+                    textAlign={TextAlign.End}
+                    data-testid="multichain-token-list-item-secondary-value"
+                    ellipsis={isStakeable}
+                  >
+                    {secondary}
+                  </Text>
+                ) : (
+                  <Text
+                    data-testid="multichain-token-list-item-value"
+                    color={TextColor.textAlternative}
+                    fontWeight={FontWeight.Medium}
+                    variant={TextVariant.bodyMd}
+                    textAlign={TextAlign.End}
+                  >
+                    {primary} {isNativeCurrency ? '' : tokenSymbol}
+                  </Text>
+                )}
+              </Box>
             ) : (
-              <Text
-                fontWeight={FontWeight.Medium}
-                variant={TextVariant.bodyMd}
+              <Box
+                display={Display.Flex}
+                flexDirection={FlexDirection.Column}
                 width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
-                textAlign={TextAlign.End}
-                data-testid="multichain-token-list-item-secondary-value"
-                ellipsis={isStakeable}
+                alignItems={AlignItems.flexEnd}
               >
-                {secondary}
-              </Text>
+                <Text
+                  fontWeight={FontWeight.Medium}
+                  variant={TextVariant.bodyMd}
+                  width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
+                  textAlign={TextAlign.End}
+                  data-testid="multichain-token-list-item-secondary-value"
+                  ellipsis={isStakeable}
+                >
+                  {secondary}
+                </Text>
+                <Text
+                  data-testid="multichain-token-list-item-value"
+                  color={TextColor.textAlternative}
+                  fontWeight={FontWeight.Medium}
+                  variant={TextVariant.bodyMd}
+                  textAlign={TextAlign.End}
+                >
+                  {primary} {isNativeCurrency ? '' : tokenSymbol}
+                </Text>
+              </Box>
             )}
           </Box>
           <Box
@@ -276,32 +335,7 @@ export const TokenListItem = ({
             flexDirection={FlexDirection.Row}
             justifyContent={JustifyContent.spaceBetween}
             gap={1}
-          >
-            <Box width={BlockSize.OneThird}>
-              {/* bottom left */}
-              <Text
-                fontWeight={FontWeight.Medium}
-                variant={TextVariant.bodyMd}
-                color={TextColor.textAlternative}
-                data-testid="multichain-token-list-item-token-name" //
-                ellipsis
-              >
-                {tokenTitle}
-              </Text>
-            </Box>
-            <Box style={{ overflow: 'hidden' }} width={BlockSize.TwoThirds}>
-              {/* bottom right */}
-              <Text
-                data-testid="multichain-token-list-item-value"
-                color={TextColor.textAlternative}
-                fontWeight={FontWeight.Medium}
-                variant={TextVariant.bodyMd}
-                textAlign={TextAlign.End}
-              >
-                {primary} {isNativeCurrency ? '' : tokenSymbol}
-              </Text>
-            </Box>
-          </Box>
+          ></Box>
         </Box>
       </Box>
       {showScamWarningModal ? (
diff --git a/ui/components/multichain/token-list-item/token-list-item.test.js b/ui/components/multichain/token-list-item/token-list-item.test.js
index 64fe80fc9147..9cc754d62d3e 100644
--- a/ui/components/multichain/token-list-item/token-list-item.test.js
+++ b/ui/components/multichain/token-list-item/token-list-item.test.js
@@ -20,6 +20,9 @@ const state = {
     },
     useTokenDetection: false,
     currencyRates: {},
+    preferences: {
+      useNativeCurrencyAsPrimaryCurrency: false,
+    },
   },
 };
 
@@ -54,6 +57,58 @@ describe('TokenListItem', () => {
     );
   });
 
+  it('should render crypto balance with warning scam', () => {
+    const store = configureMockStore()(state);
+    const propsToUse = {
+      primary: '11.9751 ETH',
+      isNativeCurrency: true,
+      isOriginalTokenSymbol: false,
+    };
+    const { getByText } = renderWithProvider(
+      <TokenListItem {...propsToUse} />,
+      store,
+    );
+    expect(getByText('11.9751 ETH')).toBeInTheDocument();
+  });
+
+  it('should display warning scam modal', () => {
+    const store = configureMockStore()(state);
+    const propsToUse = {
+      primary: '11.9751 ETH',
+      isNativeCurrency: true,
+      isOriginalTokenSymbol: false,
+    };
+    const { getByTestId, getByText } = renderWithProvider(
+      <TokenListItem {...propsToUse} />,
+      store,
+    );
+
+    const warningScamModal = getByTestId('scam-warning');
+    fireEvent.click(warningScamModal);
+
+    expect(getByText('This is a potential scam')).toBeInTheDocument();
+  });
+
+  it('should render crypto balance if useNativeCurrencyAsPrimaryCurrency is false', () => {
+    const store = configureMockStore()({
+      ...state,
+      preferences: {
+        useNativeCurrencyAsPrimaryCurrency: false,
+      },
+    });
+    const propsToUse = {
+      primary: '11.9751 ETH',
+      isNativeCurrency: true,
+      isOriginalTokenSymbol: false,
+    };
+
+    const { getByText } = renderWithProvider(
+      <TokenListItem {...propsToUse} />,
+      store,
+    );
+    expect(getByText('11.9751 ETH')).toBeInTheDocument();
+  });
+
   it('handles click action and fires onClick', () => {
     const store = configureMockStore()(state);
     const { queryByTestId } = renderWithProvider(
diff --git a/ui/components/ui/account-list/account-list.js b/ui/components/ui/account-list/account-list.js
index b9cffad6e4fa..165063fe1072 100644
--- a/ui/components/ui/account-list/account-list.js
+++ b/ui/components/ui/account-list/account-list.js
@@ -3,13 +3,30 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { isEqual } from 'lodash';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import CheckBox, { CHECKED, INDETERMINATE, UNCHECKED } from '../check-box';
 import Identicon from '../identicon';
 import UserPreferencedCurrencyDisplay from '../../app/user-preferenced-currency-display';
 import { PRIMARY } from '../../../helpers/constants/common';
 import Tooltip from '../tooltip';
-import { Icon, IconName } from '../../component-library';
-import { IconColor } from '../../../helpers/constants/design-system';
+import {
+  Box,
+  ButtonLink,
+  Checkbox,
+  Icon,
+  IconName,
+  Text,
+} from '../../component-library';
+import {
+  AlignItems,
+  BackgroundColor,
+  BlockSize,
+  Color,
+  Display,
+  FlexDirection,
+  IconColor,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
 
 const AccountList = ({
   selectNewAccountViaModal,
@@ -26,16 +43,19 @@ const AccountList = ({
   const selectedAccountScrollRef = useRef(null);
   useLayoutEffect(() => {
     selectedAccountScrollRef.current?.scrollIntoView({ behavior: 'smooth' });
-  }, [selectedAccounts]);
+  }, []);
+
+  const [firstSelectedAccount] = selectedAccounts;
 
   const Header = () => {
-    let checked;
+    let checked = false;
+    let isIndeterminate = false;
     if (allAreSelected()) {
-      checked = CHECKED;
+      checked = true;
     } else if (selectedAccounts.size === 0) {
-      checked = UNCHECKED;
+      checked = false;
     } else {
-      checked = INDETERMINATE;
+      isIndeterminate = true;
     }
 
     return (
@@ -47,15 +67,20 @@ const AccountList = ({
       >
         {accounts.length > 1 ? (
           <div className="choose-account-list__select-all">
-            <CheckBox
+            <Checkbox
               className="choose-account-list__header-check-box"
-              dataTestId="choose-account-list-operate-all-check-box"
-              checked={checked}
+              data-testid="choose-account-list-operate-all-check-box"
+              isChecked={checked}
+              isIndeterminate={isIndeterminate}
               onClick={() => (allAreSelected() ? deselectAll() : selectAll())}
             />
-            <div className="choose-account-list__text-grey">
+            <Text
+              as="div"
+              className="choose-account-list__text-grey"
+              color={TextColor.textAlternative}
+            >
               {t('selectAll')}
-            </div>
+            </Text>
             <Tooltip
               position="bottom"
               html={
@@ -73,75 +98,124 @@ const AccountList = ({
             </Tooltip>
           </div>
         ) : null}
-        <div
-          className="choose-account-list__text-blue"
+        <ButtonLink
+          color={TextColor.infoDefault}
+          variant={TextVariant.bodyMdMedium}
+          style={{
+            cursor: 'pointer',
+          }}
           onClick={() => selectNewAccountViaModal(handleAccountClick)}
         >
           {t('newAccount')}
-        </div>
+        </ButtonLink>
       </div>
     );
   };
 
-  const List = () => {
-    return (
+  return (
+    <div className="choose-account-list">
+      <Header />
       <div className="choose-account-list__wrapper">
-        <div className="choose-account-list__list">
+        <Box
+          className="choose-account-list__list"
+          style={{ overflowX: 'hidden' }}
+        >
           {accounts.map((account, index) => {
             const { address, addressLabel, balance } = account;
             const isSelectedAccount = selectedAccounts.has(address);
             return (
-              <div
+              <Box
+                display={Display.Flex}
+                width={BlockSize.Full}
                 key={`choose-account-list-${index}`}
                 onClick={() => handleAccountClick(address)}
                 className="choose-account-list__account"
-                ref={isSelectedAccount ? selectedAccountScrollRef : null}
+                ref={
+                  isSelectedAccount && address === firstSelectedAccount
+                    ? selectedAccountScrollRef
+                    : null
+                }
+                backgroundColor={
+                  isSelectedAccount
+                    ? Color.primaryMuted
+                    : BackgroundColor.backgroundDefault
+                }
               >
-                <div className="choose-account-list__account-info-wrapper">
-                  <CheckBox
-                    className="choose-account-list__list-check-box"
-                    checked={isSelectedAccount}
-                  />
-                  <Identicon diameter={34} address={address} />
-                  <div className="choose-account-list__account__info">
-                    <div className="choose-account-list__account__label">
-                      {addressLabel}
-                    </div>
-                    <UserPreferencedCurrencyDisplay
-                      className="choose-account-list__account__balance"
-                      type={PRIMARY}
-                      value={balance}
-                      style={{ color: 'var(--color-text-alternative)' }}
-                      suffix={nativeCurrency}
-                    />
-                  </div>
-                </div>
-                {addressLastConnectedMap[address] ? (
-                  <Tooltip
-                    title={`${t('lastConnected')} ${
-                      addressLastConnectedMap[address]
-                    }`}
+                <Box
+                  display={Display.Flex}
+                  width={BlockSize.Full}
+                  alignItems={AlignItems.center}
+                >
+                  <Checkbox isChecked={isSelectedAccount} />
+                  <Box marginLeft={2}>
+                    <Identicon diameter={34} address={address} />
+                  </Box>
+                  <Box
+                    display={Display.Flex}
+                    justifyContent={JustifyContent.spaceBetween}
+                    width={BlockSize.Full}
+                    paddingLeft={3}
+                    style={{
+                      minWidth: 0,
+                    }}
                   >
-                    <Icon
-                      name={IconName.Info}
-                      color={IconColor.iconMuted}
-                      className="info-circle"
-                      marginInlineStart={2}
-                    />
-                  </Tooltip>
-                ) : null}
-              </div>
+                    <Box
+                      display={Display.Flex}
+                      flexDirection={FlexDirection.Column}
+                      width={BlockSize.Full}
+                    >
+                      <Text
+                        variant={TextVariant.bodyMdMedium}
+                        style={{
+                          textWrap: 'nowrap',
+                        }}
+                        ellipsis
+                      >
+                        {addressLabel}
+                      </Text>
+                      <Box display={Display.Flex}>
+                        <UserPreferencedCurrencyDisplay
+                          type={PRIMARY}
+                          value={balance}
+                          style={{
+                            color: 'var(--color-text-alternative)',
+                            flexWrap: 'nowrap',
+                          }}
+                          suffix={nativeCurrency}
+                          numberOfDecimals={2}
+                          ethNumberOfDecimals={5}
+                          textProps={{
+                            color: TextColor.textAlternative,
+                            variant: TextVariant.bodySm,
+                          }}
+                          suffixProps={{
+                            color: TextColor.textAlternative,
+                            variant: TextVariant.bodySm,
+                          }}
+                        />
+                      </Box>
+                    </Box>
+                  </Box>
+                  {addressLastConnectedMap[address] ? (
+                    <Tooltip
+                      title={`${t('lastConnected')} ${
+                        addressLastConnectedMap[address]
+                      }`}
+                    >
+                      <Icon
+                        name={IconName.Info}
+                        color={IconColor.iconMuted}
+                        className="info-circle"
+                        marginInlineStart={2}
+                      />
+                    </Tooltip>
+                  ) : null}
+                </Box>
+              </Box>
             );
           })}
-        </div>
+        </Box>
       </div>
-    );
-  };
-
-  return (
-    <div className="choose-account-list">
-      <Header />
-      <List />
     </div>
   );
 };
diff --git a/ui/components/ui/account-list/account-list.stories.js b/ui/components/ui/account-list/account-list.stories.js
index 42a2b175b8b2..f42134683892 100644
--- a/ui/components/ui/account-list/account-list.stories.js
+++ b/ui/components/ui/account-list/account-list.stories.js
@@ -37,23 +37,42 @@ export default {
     accounts: [
       {
         address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
-        addressLabel: 'Account 1',
+        addressLabel: 'Account 1 (0xbc641...29713)',
         lastConnectedDate: 'Feb-22-2022',
         balance: '8.7a73149c048545a3fe58',
         has: () => {
           /**  nothing to do */
         },
       },
-    ],
-    selectedAccounts: {
-      address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
-      addressLabel: 'Account 2',
-      lastConnectedDate: 'Feb-22-2022',
-      balance: '8.7a73149c048545a3fe58',
-      has: () => {
-        /** nothing to do */
+      {
+        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
+        addressLabel: 'Very long account name (0xb366c...015ba)',
+        lastConnectedDate: 'Feb-22-2022',
+        balance: '0x1bc16d674ec80000',
+        has: () => {
+          /**  nothing to do */
+        },
       },
-    },
+      {
+        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
+        addressLabel: 'DeFi Account (0xb366c...015ba)',
+        lastConnectedDate: 'Feb-22-2022',
+        balance: '0x2bc16d674ec80000',
+        has: () => {
+          /**  nothing to do */
+        },
+      },
+      {
+        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
+        addressLabel: 'Gaming Account (0xb366c...015ba)',
+        lastConnectedDate: 'Feb-22-2022',
+        balance: '0x12c16d674ec80000',
+        has: () => {
+          /**  nothing to do */
+        },
+      },
+    ],
+    selectedAccounts: new Set(['0x64a845a5b02460acf8a3d84503b0d68d028b4bb4']),
     addressLastConnectedMap: {
       '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': 'Feb-22-2022',
     },
diff --git a/ui/components/ui/account-list/account-list.test.js b/ui/components/ui/account-list/account-list.test.js
index e9e3ca4b19b0..bf88efc7358b 100644
--- a/ui/components/ui/account-list/account-list.test.js
+++ b/ui/components/ui/account-list/account-list.test.js
@@ -17,6 +17,7 @@ const render = () => {
       {
         address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
         addressLabel: 'Account 1',
+        label: 'Account 1',
         lastConnectedDate: 'Feb-22-2022',
         balance: '87a73149c048545a3fe58',
         has: () => {
@@ -24,15 +25,7 @@ const render = () => {
         },
       },
     ],
-    selectedAccounts: {
-      address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
-      addressLabel: 'Account 2',
-      lastConnectedDate: 'Feb-22-2022',
-      balance: '87a73149c048545a3fe58',
-      has: () => {
-        /** nothing to do */
-      },
-    },
+    selectedAccounts: new Set(['0x64a845a5b02460acf8a3d84503b0d68d028b4bb4']),
     addressLastConnectedMap: {
       '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': 'Feb-22-2022',
     },
diff --git a/ui/components/ui/account-list/index.scss b/ui/components/ui/account-list/index.scss
index 40a59ebb21bd..fe40816d687a 100644
--- a/ui/components/ui/account-list/index.scss
+++ b/ui/components/ui/account-list/index.scss
@@ -3,7 +3,6 @@
 .choose-account-list {
   display: flex;
   flex-direction: column;
-  width: 100%;
   align-items: center;
   overflow-y: auto;
 
@@ -11,7 +10,6 @@
   &__header--multiple-items {
     display: flex;
     flex: 0;
-    margin-top: 36px;
     width: 100%;
     padding-inline-start: 16px;
     padding-inline-end: 17px;
@@ -35,6 +33,7 @@
   }
 
   &__wrapper {
+    margin-top: 8px;
     display: flex;
     overflow: hidden;
     width: 100%;
@@ -63,7 +62,7 @@
     }
 
     &:hover {
-      background: var(--color-background-alternative);
+      background: var(--color-primary-muted);
       cursor: pointer;
     }
 
@@ -74,21 +73,6 @@
       min-width: 0;
     }
 
-    &__label {
-      @include design-system.H6;
-
-      color: var(--color-text-default);
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
-    }
-
-    &__balance {
-      @include design-system.H7;
-
-      color: var(--color-text-default);
-    }
-
     &__last-connected {
       @include design-system.H8;
 
@@ -121,19 +105,4 @@
   .info-circle:hover {
     color: var(--color-icon-default);
   }
-
-  &__text,
-  &__text-blue,
-  &__text-grey {
-    @include design-system.H6;
-  }
-
-  &__text-blue {
-    color: var(--color-primary-default);
-    cursor: pointer;
-  }
-
-  &__text-grey {
-    color: var(--color-text-default);
-  }
 }
diff --git a/ui/components/ui/box/box.d.ts b/ui/components/ui/box/box.d.ts
index 7d3dac53685e..f7c3242522d0 100644
--- a/ui/components/ui/box/box.d.ts
+++ b/ui/components/ui/box/box.d.ts
@@ -21,6 +21,8 @@ import {
   BorderRadius,
 } from '../../../helpers/constants/design-system';
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type BoxChildren = React.ReactNode | ((...args: any[]) => any);
 
 export type FlexDirectionArray = [
diff --git a/ui/components/ui/currency-display/currency-display.component.d.ts b/ui/components/ui/currency-display/currency-display.component.d.ts
index c2eb35fa2315..d8e1d6b60e1e 100644
--- a/ui/components/ui/currency-display/currency-display.component.d.ts
+++ b/ui/components/ui/currency-display/currency-display.component.d.ts
@@ -16,8 +16,14 @@ export type CurrencyDisplayProps = OverridingUnion<
     prefixComponent?: ReactElement;
     suffix?: string | boolean;
     value?: string;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     prefixComponentWrapperProps?: Record<string, any>;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     textProps?: Record<string, any>;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     suffixProps?: Record<string, any>;
   }
 >;
diff --git a/ui/components/ui/disclosure/disclosure.scss b/ui/components/ui/disclosure/disclosure.scss
index 179de33dbeef..4a86722f9ac0 100644
--- a/ui/components/ui/disclosure/disclosure.scss
+++ b/ui/components/ui/disclosure/disclosure.scss
@@ -1,10 +1,8 @@
 .disclosure {
-  margin: 12px 0;
   font-size: 14px;
 
   &__summary {
     position: relative;
-    padding-bottom: 10px;
     font-weight: bold;
     display: flex;
     cursor: pointer;
@@ -17,7 +15,8 @@
   }
 
   &__content {
-    margin-left: 12px;
+    padding-top: 10px;
+    margin-inline-start: 12px;
     font-size: 14px;
 
     &.small {
diff --git a/ui/components/ui/editable-label/editable-label.js b/ui/components/ui/editable-label/editable-label.js
index 38d9f7d7f9d5..dc2ca732a617 100644
--- a/ui/components/ui/editable-label/editable-label.js
+++ b/ui/components/ui/editable-label/editable-label.js
@@ -71,6 +71,7 @@ export default class EditableLabel extends Component {
         <ButtonIcon
           iconName={IconName.Check}
           onClick={() => this.handleSubmit(isValidAccountName)}
+          data-testid="save-account-label-input"
         />
       </Box>
     );
diff --git a/ui/components/ui/form-combo-field/form-combo-field.tsx b/ui/components/ui/form-combo-field/form-combo-field.tsx
index d30099fffc8c..d10a16de01d9 100644
--- a/ui/components/ui/form-combo-field/form-combo-field.tsx
+++ b/ui/components/ui/form-combo-field/form-combo-field.tsx
@@ -101,6 +101,8 @@ function Dropdown<Option extends FormComboFieldOption>({
   width: number;
 }) {
   const t = useContext(I18nContext);
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const ref = useRef<any>();
   const maxHeight = maxDropdownHeight ?? 179;
   const [dropdownHeight, setDropdownHeight] = useState(0);
@@ -151,8 +153,12 @@ export default function FormComboField<Option extends FormComboFieldOption>({
   value,
 }: FormComboFieldProps<Option>) {
   const [dropdownVisible, setDropdownVisible] = useState(false);
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const valueRef = useRef<any>();
   const [valueWidth, setValueWidth] = useState(0);
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const inputRef = useRef<any>(null);
   const t = useContext(I18nContext);
 
@@ -161,6 +167,8 @@ export default function FormComboField<Option extends FormComboFieldOption>({
   });
 
   const handleBlur = useCallback(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (e?: any) => {
       if (e?.relatedTarget?.className !== 'form-combo-field__option') {
         setDropdownVisible(false);
@@ -170,6 +178,8 @@ export default function FormComboField<Option extends FormComboFieldOption>({
   );
 
   const handleChange = useCallback(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (e: any) => {
       onChange?.(e.target.value);
     },
@@ -208,6 +218,8 @@ export default function FormComboField<Option extends FormComboFieldOption>({
           inputRef={inputRef}
           placeholder={placeholder}
           onBlur={handleBlur}
+          // TODO: Replace `any` with type
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           onKeyUp={(e: any) => {
             if (e.key === 'Enter') {
               handleBlur();
diff --git a/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js b/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js
index 93ade0dcb113..9bf944e78955 100644
--- a/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js
+++ b/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js
@@ -28,7 +28,7 @@ const IconWithFallback = ({
   };
 
   return (
-    <div className={classnames(wrapperClassName)}>
+    <div className={classnames(wrapperClassName)} style={style}>
       {!iconError && icon ? (
         <img
           onError={handleOnError}
diff --git a/ui/components/ui/loading-indicator/loading-indicator.js b/ui/components/ui/loading-indicator/loading-indicator.js
index 66543998758c..59754bd6de0c 100644
--- a/ui/components/ui/loading-indicator/loading-indicator.js
+++ b/ui/components/ui/loading-indicator/loading-indicator.js
@@ -1,21 +1,23 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Box } from '../../component-library';
 
 export default function LoadingIndicator({
   alt,
   title,
   isLoading,
   children = null,
+  ...props
 }) {
   return isLoading ? (
-    <span className="loading-indicator">
+    <Box className="loading-indicator" {...props}>
       <img
         className="loading-indicator__spinner"
         alt={alt}
         title={title}
         src="images/loading.svg"
       />
-    </span>
+    </Box>
   ) : (
     children
   );
diff --git a/ui/components/ui/loading-indicator/loading-indicator.scss b/ui/components/ui/loading-indicator/loading-indicator.scss
index 1942b83898e7..4264a0599840 100644
--- a/ui/components/ui/loading-indicator/loading-indicator.scss
+++ b/ui/components/ui/loading-indicator/loading-indicator.scss
@@ -5,13 +5,11 @@
   position: relative;
   height: 16px;
   width: 16px;
-  margin-left: 5px;
 
   &__spinner {
+    position: absolute;
     width: 27px;
     height: 26px;
-    position: absolute;
-    top: -5px;
-    left: -6px;
+    left: -5px;
   }
 }
diff --git a/ui/components/ui/metafox-logo/horizontal-logo.js b/ui/components/ui/metafox-logo/horizontal-logo.js
index ca80968bd42c..e2bea0127c29 100644
--- a/ui/components/ui/metafox-logo/horizontal-logo.js
+++ b/ui/components/ui/metafox-logo/horizontal-logo.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { ThemeType } from '../../../../shared/constants/preferences';
diff --git a/ui/components/ui/new-network-info/index.scss b/ui/components/ui/new-network-info/index.scss
index 6a70a4c4331e..989a927bb251 100644
--- a/ui/components/ui/new-network-info/index.scss
+++ b/ui/components/ui/new-network-info/index.scss
@@ -16,7 +16,7 @@
       }
 
       a:hover > span {
-        color: var(--color-text-default);
+        color: var(--inherit);
       }
     }
 
diff --git a/ui/components/ui/new-network-info/new-network-info.js b/ui/components/ui/new-network-info/new-network-info.js
index 0b891b769b0a..37520ff16711 100644
--- a/ui/components/ui/new-network-info/new-network-info.js
+++ b/ui/components/ui/new-network-info/new-network-info.js
@@ -20,6 +20,7 @@ import {
   getIsBridgeChain,
   getMetaMetricsId,
   getUseTokenDetection,
+  getUseExternalServices,
 } from '../../../selectors';
 import { setFirstTimeUsedNetwork } from '../../../store/actions';
 import {
@@ -43,6 +44,7 @@ export default function NewNetworkInfo() {
   const [showPopup, setShowPopup] = useState(true);
   const [isLoading, setIsLoading] = useState(true);
   const autoDetectToken = useSelector(getUseTokenDetection);
+  const areExternalServicesEnabled = useSelector(getUseExternalServices);
   const providerConfig = useSelector(getProviderConfig);
   const currentNetwork = useSelector(getCurrentNetwork);
   const metaMetricsId = useSelector(getMetaMetricsId);
@@ -65,6 +67,9 @@ export default function NewNetworkInfo() {
   }, [providerConfig.chainId]);
 
   useEffect(() => {
+    if (!areExternalServicesEnabled) {
+      return;
+    }
     checkTokenDetection();
     // we want to only fetch once
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -99,11 +104,7 @@ export default function NewNetworkInfo() {
               size={ButtonPrimarySize.Md}
               className="footer__button"
             >
-              <Text
-                variant={TextVariant.bodySm}
-                as="h6"
-                color={TextColor.textDefault}
-              >
+              <Text variant={TextVariant.bodySm} as="h6" color={Color.inherit}>
                 {t('recoveryPhraseReminderConfirm')}
               </Text>
             </Button>
diff --git a/ui/components/ui/new-network-info/new-network-info.test.js b/ui/components/ui/new-network-info/new-network-info.test.js
index 1af1d1ef2337..d964218c0cda 100644
--- a/ui/components/ui/new-network-info/new-network-info.test.js
+++ b/ui/components/ui/new-network-info/new-network-info.test.js
@@ -90,6 +90,7 @@ describe('NewNetworkInfo', () => {
           chainId: '0x1',
           type: 'mainnet',
         },
+        useExternalServices: true,
         useTokenDetection: false,
         currencyRates: {},
       },
@@ -183,6 +184,7 @@ describe('NewNetworkInfo', () => {
             chainId: '0x1',
             type: 'mainnet',
           },
+          useExternalServices: true,
           useTokenDetection: true,
           currencyRates: {},
         },
diff --git a/ui/components/ui/site-icon/README.mdx b/ui/components/ui/site-icon/README.mdx
deleted file mode 100644
index 3b7d65d0b613..000000000000
--- a/ui/components/ui/site-icon/README.mdx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import SiteIcon from '.';
-
-# SiteIcon
-
-SiteIcon uses the `IconBorder` and `IconWithFallback` components to create an icon within a gray ellipse
-
-<Canvas>
-  <Story id="components-ui-siteicon--default-story" />
-</Canvas>
-
-## Props
-
-<ArgsTable of={SiteIcon} />
-
-## Usage
-
-The following describes the props and example usage for this component.
-
-### Fallback
-
-`SiteIcon` wraps the `IconWithFallback` component which has a fallback `onError` and will display the first letter of the `name` prop
-
-<Canvas>
-  <Story id="components-ui-siteicon--fallback" />
-</Canvas>
diff --git a/ui/components/ui/site-icon/index.js b/ui/components/ui/site-icon/index.js
deleted file mode 100644
index 1097b3c64eb4..000000000000
--- a/ui/components/ui/site-icon/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './site-icon';
diff --git a/ui/components/ui/site-icon/site-icon.js b/ui/components/ui/site-icon/site-icon.js
deleted file mode 100644
index 029742ee0813..000000000000
--- a/ui/components/ui/site-icon/site-icon.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import IconBorder from '../icon-border';
-import IconWithFallback from '../icon-with-fallback';
-
-/**
- * @deprecated `<SiteIcon />` has been deprecated in favor of the new `<AvatarFavicon>` component from the component-library.
- * Please update your code to use the new <AvatarFavicon> component instead, which can be found at ./ui/components/component-library/avatar-favicon.js.
- * You can find documentation for the new AvatarFavicon component in the MetaMask Storybook:
- * {@link https://metamask.github.io/metamask-storybook/?path=/story/components-componentlibrary-avatarfavicon--default-story}
- * Help to replace `SiteIcon` with `AvatarFavicon` by submitting a PR
- */
-
-export default function SiteIcon({ icon = null, name = '', size, className }) {
-  const iconSize = Math.floor(size * 0.75);
-  return (
-    <IconBorder size={size} className={className}>
-      <IconWithFallback icon={icon} name={name} size={iconSize} />
-    </IconBorder>
-  );
-}
-
-SiteIcon.propTypes = {
-  /**
-   * Additional className to add to the root element of SiteIcon.
-   */
-  className: PropTypes.string,
-  /**
-   * The img src of the icon.
-   * Used in IconWithFallback
-   */
-  icon: PropTypes.string,
-  /**
-   * The name of the icon also used for the alt tag of the image and fallback letter.
-   * Used in IconWithFallback
-   */
-  name: PropTypes.string,
-  /**
-   * The size of the icon.
-   * Used in IconWithFallback
-   */
-  size: PropTypes.number.isRequired,
-};
diff --git a/ui/components/ui/site-icon/site-icon.stories.js b/ui/components/ui/site-icon/site-icon.stories.js
deleted file mode 100644
index bb1c7998ee7c..000000000000
--- a/ui/components/ui/site-icon/site-icon.stories.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-
-import README from './README.mdx';
-import SiteIcon from '.';
-
-export default {
-  title: 'Components/UI/SiteIcon',
-
-  component: SiteIcon,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argTypes: {
-    icon: {
-      control: 'text',
-    },
-    name: {
-      control: 'text',
-    },
-    size: {
-      control: 'number',
-    },
-  },
-};
-
-export const DefaultStory = (args) => <SiteIcon {...args} />;
-
-DefaultStory.storyName = 'Default';
-
-DefaultStory.args = {
-  name: 'eth',
-  icon: './images/eth_logo.svg',
-  size: 24,
-};
-
-export const Fallback = (args) => <SiteIcon {...args} />;
-
-Fallback.args = {
-  name: 'eth',
-  size: 24,
-};
diff --git a/ui/components/ui/site-icon/site-icon.test.js b/ui/components/ui/site-icon/site-icon.test.js
deleted file mode 100644
index f1e793c3ba51..000000000000
--- a/ui/components/ui/site-icon/site-icon.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as React from 'react';
-import { render } from '@testing-library/react';
-import SiteIcon from '.';
-
-describe('SiteIcon', () => {
-  const args = {
-    size: 32,
-    name: 'Snap name',
-    icon: './images/eth_logo.svg',
-    className: 'classname-test',
-    fallbackClassName: 'fallback-classname-test',
-  };
-
-  it('should render without crashing', () => {
-    const { getByText } = render(<SiteIcon size={32} name={args.name} />);
-    expect(getByText('S')).toBeDefined();
-  });
-
-  it('should render an icon image', () => {
-    const { getByAltText } = render(<SiteIcon {...args} />);
-    const image = getByAltText(args.name);
-    expect(image).toBeDefined();
-    expect(image).toHaveAttribute('src', args.icon);
-  });
-});
diff --git a/ui/components/ui/toggle-button/toggle-button.component.js b/ui/components/ui/toggle-button/toggle-button.component.js
index 360da2d59cd2..b6c723496adc 100644
--- a/ui/components/ui/toggle-button/toggle-button.component.js
+++ b/ui/components/ui/toggle-button/toggle-button.component.js
@@ -2,13 +2,15 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ReactToggleButton from 'react-toggle-button';
 import classnames from 'classnames';
+import { lightTheme, darkTheme } from '@metamask/design-tokens';
+import { useTheme } from '../../../hooks/useTheme';
 
 const trackStyle = {
   width: '40px',
   height: '24px',
   padding: '0px',
   borderRadius: '26px',
-  border: '2px solid var(--color-primary-default)',
+  border: 'none',
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'center',
@@ -16,33 +18,50 @@ const trackStyle = {
 
 const offTrackStyle = {
   ...trackStyle,
-  border: '2px solid var(--color-border-default)',
+  border: 'none',
 };
 
 const thumbStyle = {
   width: '18px',
   height: '18px',
   display: 'flex',
-  boxShadow: 'none',
+  boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
   alignSelf: 'center',
   borderRadius: '50%',
   position: 'relative',
 };
 
-const colors = {
+const colorsLight = {
   activeThumb: {
-    base: '#037DD6', // var(--brand-colors-blue-blue500)
+    base: lightTheme.colors.primary.inverse,
   },
   inactiveThumb: {
-    base: '#6A737D', // var(--brand-colors-grey-grey500)
+    base: lightTheme.colors.primary.inverse,
   },
   active: {
-    base: '#F2F4F6', // var(--brand-colors-grey-grey040)
-    hover: '#F2F4F6', // var(--brand-colors-grey-grey040)
+    base: lightTheme.colors.primary.default,
+    hover: lightTheme.colors.primary.defaultHover,
   },
   inactive: {
-    base: '#F2F4F6', // var(--brand-colors-grey-grey040)
-    hover: '#F2F4F6', // var(--brand-colors-grey-grey040)
+    base: lightTheme.colors.icon.muted,
+    hover: lightTheme.colors.icon.muted,
+  },
+};
+
+const colorsDark = {
+  activeThumb: {
+    base: lightTheme.colors.primary.inverse,
+  },
+  inactiveThumb: {
+    base: lightTheme.colors.primary.inverse,
+  },
+  active: {
+    base: darkTheme.colors.primary.default,
+    hover: darkTheme.colors.primary.defaultHover,
+  },
+  inactive: {
+    base: darkTheme.colors.icon.muted,
+    hover: darkTheme.colors.icon.muted,
   },
 };
 
@@ -59,6 +78,8 @@ const ToggleButton = (props) => {
 
   const modifier = value ? 'on' : 'off';
 
+  const theme = useTheme();
+
   return (
     <label
       tabIndex="0"
@@ -84,7 +105,7 @@ const ToggleButton = (props) => {
         trackStyle={value ? trackStyle : offTrackStyle}
         thumbStyle={thumbStyle}
         thumbAnimateRange={[3, 18]}
-        colors={colors}
+        colors={theme === 'light' ? colorsLight : colorsDark}
         passThroughInputProps={{
           'data-testid': dataTestId,
         }}
diff --git a/ui/components/ui/tooltip/tooltip.js b/ui/components/ui/tooltip/tooltip.js
index abe2ce03a7dd..8e9021f2b2cf 100644
--- a/ui/components/ui/tooltip/tooltip.js
+++ b/ui/components/ui/tooltip/tooltip.js
@@ -10,6 +10,7 @@ export default class Tooltip extends PureComponent {
     html: null,
     interactive: undefined,
     onHidden: null,
+    distance: 0,
     position: 'left',
     offset: 0,
     open: undefined,
@@ -28,6 +29,7 @@ export default class Tooltip extends PureComponent {
     containerClassName: PropTypes.string,
     disabled: PropTypes.bool,
     html: PropTypes.node,
+    distance: PropTypes.number,
     interactive: PropTypes.bool,
     offset: PropTypes.number,
     onHidden: PropTypes.func,
@@ -54,6 +56,7 @@ export default class Tooltip extends PureComponent {
       html,
       interactive,
       size,
+      distance,
       title,
       trigger,
       onHidden,
@@ -79,6 +82,7 @@ export default class Tooltip extends PureComponent {
         className={containerClassName}
         disabled={disabled}
         hideOnClick={false}
+        distance={distance}
         html={html}
         interactive={interactive}
         onHidden={onHidden}
diff --git a/ui/constants/index.js b/ui/constants/index.js
new file mode 100644
index 000000000000..10365729d0dc
--- /dev/null
+++ b/ui/constants/index.js
@@ -0,0 +1 @@
+export const ETH_DEFAULT_DECIMALS = 8;
diff --git a/ui/contexts/currencyRate.js b/ui/contexts/currencyRate.js
new file mode 100644
index 000000000000..6739b730a882
--- /dev/null
+++ b/ui/contexts/currencyRate.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import useCurrencyRatePolling from '../hooks/useCurrencyRatePolling';
+
+export const CurrencyRateProvider = ({ children }) => {
+  useCurrencyRatePolling();
+
+  return <>{children}</>;
+};
+
+CurrencyRateProvider.propTypes = {
+  children: PropTypes.node,
+};
diff --git a/ui/ducks/app/app.test.js b/ui/ducks/app/app.test.js
index 81a7619120bc..0d6441454f90 100644
--- a/ui/ducks/app/app.test.js
+++ b/ui/ducks/app/app.test.js
@@ -5,15 +5,7 @@ import reduceApp from './app';
 const actions = actionConstants;
 
 describe('App State', () => {
-  const metamaskState = {
-    selectedAddress: '0xAddress',
-    identities: {
-      '0xAddress': {
-        name: 'account 1',
-        address: '0xAddress',
-      },
-    },
-  };
+  const metamaskState = {};
 
   it('app init state', () => {
     const initState = reduceApp(metamaskState, {});
diff --git a/ui/ducks/app/app.ts b/ui/ducks/app/app.ts
index 2273c0bc4abd..eee7c06d31f2 100644
--- a/ui/ducks/app/app.ts
+++ b/ui/ducks/app/app.ts
@@ -13,6 +13,8 @@ type AppState = {
     open: boolean;
     modalState: {
       name: string | null;
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       props: Record<string, any>;
     };
     previousModalState: {
@@ -49,6 +51,8 @@ type AppState = {
   loadingMessage: string | null;
   scrollToBottom: boolean;
   warning: string | null | undefined;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   buyView: Record<string, any>;
   defaultHdPaths: {
     trezor: string;
@@ -58,6 +62,8 @@ type AppState = {
   networksTabSelectedRpcUrl: string | null;
   requestAccountTabs: Record<string, number>; // [url.origin]: tab.id
   openMetaMaskTabs: Record<string, boolean>; // openMetamaskTabsIDs[tab.id]): true/false
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   currentWindowTab: Record<string, any>; // tabs.tab https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/tabs/Tab
   showWhatsNewPopup: boolean;
   showTermsOfUsePopup: boolean;
@@ -69,6 +75,8 @@ type AppState = {
   smartTransactionsErrorMessageDismissed: boolean;
   ledgerWebHidConnectedStatus: WebHIDConnectedStatuses;
   ledgerTransportStatus: HardwareTransportStates;
+  showBasicFunctionalityModal: boolean;
+  externalServicesOnboardingToggleState: boolean;
   newNftAddedMessage: string;
   removeNftMessage: string;
   newNetworkAddedName: string;
@@ -110,6 +118,8 @@ const initialState: AppState = {
   networkDropdownOpen: false,
   importNftsModal: { open: false },
   showIpfsModalOpen: false,
+  showBasicFunctionalityModal: false,
+  externalServicesOnboardingToggleState: true,
   keyringRemovalSnapModal: {
     snapName: '',
     result: 'none',
@@ -203,6 +213,29 @@ export default function reduceApp(
         },
       };
 
+    case actionConstants.SHOW_BASIC_FUNCTIONALITY_MODAL_OPEN:
+      return {
+        ...appState,
+        showBasicFunctionalityModal: true,
+      };
+
+    case actionConstants.SHOW_BASIC_FUNCTIONALITY_MODAL_CLOSE:
+      return {
+        ...appState,
+        showBasicFunctionalityModal: false,
+      };
+
+    case actionConstants.ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_ON:
+      return {
+        ...appState,
+        externalServicesOnboardingToggleState: true,
+      };
+    case actionConstants.ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_OFF:
+      return {
+        ...appState,
+        externalServicesOnboardingToggleState: false,
+      };
+
     case actionConstants.SHOW_IPFS_MODAL_OPEN:
       return {
         ...appState,
@@ -375,6 +408,8 @@ export default function reduceApp(
 
     case actionConstants.SET_HARDWARE_WALLET_DEFAULT_HD_PATH: {
       const { device, path } = action.payload;
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const newDefaults = { ...appState.defaultHdPaths } as any;
       newDefaults[device] = path;
 
@@ -547,6 +582,30 @@ export function hideWhatsNewPopup(): Action {
   };
 }
 
+export function openBasicFunctionalityModal(): Action {
+  return {
+    type: actionConstants.SHOW_BASIC_FUNCTIONALITY_MODAL_OPEN,
+  };
+}
+
+export function hideBasicFunctionalityModal(): Action {
+  return {
+    type: actionConstants.SHOW_BASIC_FUNCTIONALITY_MODAL_CLOSE,
+  };
+}
+
+export function onboardingToggleBasicFunctionalityOn(): Action {
+  return {
+    type: actionConstants.ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_ON,
+  };
+}
+
+export function onboardingToggleBasicFunctionalityOff(): Action {
+  return {
+    type: actionConstants.ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_OFF,
+  };
+}
+
 export function toggleGasLoadingAnimation(
   payload: boolean,
 ): PayloadAction<boolean> {
diff --git a/ui/ducks/confirm-alerts/confirm-alerts.test.ts b/ui/ducks/confirm-alerts/confirm-alerts.test.ts
new file mode 100644
index 000000000000..f3b1cd7f49d4
--- /dev/null
+++ b/ui/ducks/confirm-alerts/confirm-alerts.test.ts
@@ -0,0 +1,95 @@
+import { Severity } from '../../helpers/constants/design-system';
+import confirmAlertsReducer, {
+  updateAlerts,
+  setAlertConfirmed,
+  clearAlerts,
+  Alert,
+} from './confirm-alerts';
+
+describe('confirmAlertsReducer', () => {
+  const ownerIdMocked = '123';
+  const ownerId2Mocked = '321';
+  const ownerId3Mocked = '000';
+  const alertsMocked: Alert[] = [
+    {
+      key: 'from',
+      severity: Severity.Warning,
+      message: 'Alert 1',
+      reason: 'Reason 1',
+      alertDetails: ['Detail 1', 'Detail 2'],
+    },
+    { key: 'to', severity: Severity.Danger, message: 'Alert 2' },
+  ];
+  const initialState = {
+    alerts: {
+      [ownerIdMocked]: alertsMocked,
+      [ownerId2Mocked]: alertsMocked,
+      [ownerId3Mocked]: alertsMocked,
+    },
+    confirmed: {
+      [ownerIdMocked]: {
+        from: false,
+        to: false,
+      },
+      [ownerId2Mocked]: {
+        from: false,
+        to: false,
+      },
+    },
+  };
+
+  it('handles UPDATE_ALERTS action', () => {
+    const updatedAlerts = {
+      ...initialState.alerts,
+      [ownerIdMocked]: [
+        ...initialState.alerts[ownerIdMocked],
+        { ...alertsMocked[0], key: 'from2' },
+      ],
+    };
+    const action = updateAlerts(ownerIdMocked, updatedAlerts[ownerIdMocked]);
+
+    const expectedState = {
+      ...initialState,
+      alerts: updatedAlerts,
+    };
+
+    expect(confirmAlertsReducer(initialState, action)).toEqual(expectedState);
+  });
+
+  it('handles SET_ALERT_CONFIRMED action', () => {
+    const alertKey = 'to';
+    const isConfirmed = true;
+    const action = setAlertConfirmed(ownerId2Mocked, alertKey, isConfirmed);
+
+    const expectedState = {
+      ...initialState,
+      confirmed: {
+        ...initialState.confirmed,
+        [ownerId2Mocked]: {
+          ...initialState.confirmed[ownerId2Mocked],
+          [alertKey]: isConfirmed,
+        },
+      },
+    };
+
+    expect(confirmAlertsReducer(initialState, action)).toEqual(expectedState);
+  });
+
+  it('handles CLEAR_ALERTS action', () => {
+    const action = clearAlerts(ownerIdMocked);
+
+    const expectedState = {
+      ...initialState,
+      alerts: {
+        ...initialState.alerts,
+        [ownerIdMocked]: [],
+      },
+      confirmed: {
+        ...initialState.confirmed,
+        [ownerIdMocked]: {},
+      },
+    };
+
+    expect(confirmAlertsReducer(initialState, action)).toEqual(expectedState);
+  });
+});
diff --git a/ui/ducks/confirm-alerts/confirm-alerts.ts b/ui/ducks/confirm-alerts/confirm-alerts.ts
new file mode 100644
index 000000000000..698c77c4d6e6
--- /dev/null
+++ b/ui/ducks/confirm-alerts/confirm-alerts.ts
@@ -0,0 +1,153 @@
+import { Severity } from '../../helpers/constants/design-system';
+
+/**
+ * A confirmable alert to be displayed in the UI.
+ */
+export type Alert = {
+  /**
+   * The unique key of the alert.
+   */
+  key: string;
+
+  /**
+   * The field associated with the alert.
+   */
+  field?: string;
+
+  /**
+   * The severity of the alert.
+   */
+  severity: Severity.Danger | Severity.Warning | Severity.Info;
+
+  /**
+   * The message is a summary of the alert details.
+   */
+  message: string;
+
+  /**
+   * The reason for the alert.
+   */
+  reason?: string;
+
+  /**
+   * Additional details about the alert.
+   */
+  alertDetails?: string[];
+};
+
+/**
+ * Represents the state of confirm alerts in the application.
+ */
+export type ConfirmAlertsState = {
+  /**
+   * The current alerts, grouped by the ID of an abstract owner. For example, a confirmation ID.
+   */
+  alerts: { [ownerId: string]: Alert[] };
+
+  /**
+   * The acknowledgement status of the alerts, grouped first by alert key, then owner ID.
+   * and the alert key is the nested key.
+   */
+  confirmed: { [ownerId: string]: { [alertKey: string]: boolean } };
+};
+
+type UpdateAlertsAction = {
+  type: 'UPDATE_ALERTS';
+  ownerId: string;
+  alerts: Alert[];
+};
+
+type SetAlertConfirmedAction = {
+  type: 'SET_ALERT_CONFIRMED';
+  ownerId: string;
+  alertKey: string;
+  isConfirmed: boolean;
+};
+
+type ClearAlertsAction = {
+  type: 'CLEAR_ALERTS';
+  ownerId: string;
+};
+
+type Action = UpdateAlertsAction | SetAlertConfirmedAction | ClearAlertsAction;
+
+const INIT_STATE: ConfirmAlertsState = {
+  alerts: {},
+  confirmed: {},
+};
+
+export default function confirmAlertsReducer(
+  // eslint-disable-next-line @typescript-eslint/default-param-last
+  state: ConfirmAlertsState = INIT_STATE,
+  action: Action,
+) {
+  switch (action.type) {
+    case 'UPDATE_ALERTS':
+      return {
+        ...state,
+        alerts: {
+          ...state.alerts,
+          [action.ownerId]: action.alerts,
+        },
+      };
+
+    case 'SET_ALERT_CONFIRMED':
+      return {
+        ...state,
+        confirmed: {
+          ...state.confirmed,
+          [action.ownerId]: {
+            ...state.confirmed[action.ownerId],
+            [action.alertKey]: action.isConfirmed,
+          },
+        },
+      };
+
+    case 'CLEAR_ALERTS':
+      return {
+        ...state,
+        alerts: {
+          ...state.alerts,
+          [action.ownerId]: [],
+        },
+        confirmed: {
+          ...state.confirmed,
+          [action.ownerId]: {},
+        },
+      };
+
+    default:
+      return state;
+  }
+}
+
+export function updateAlerts(
+  ownerId: string,
+  alerts: Alert[],
+): UpdateAlertsAction {
+  return {
+    type: 'UPDATE_ALERTS',
+    alerts,
+    ownerId,
+  };
+}
+
+export function setAlertConfirmed(
+  ownerId: string,
+  alertKey: string,
+  isConfirmed: boolean,
+): SetAlertConfirmedAction {
+  return {
+    type: 'SET_ALERT_CONFIRMED',
+    ownerId,
+    alertKey,
+    isConfirmed,
+  };
+}
+
+export function clearAlerts(ownerId: string): ClearAlertsAction {
+  return {
+    type: 'CLEAR_ALERTS',
+    ownerId,
+  };
+}
diff --git a/ui/ducks/index.js b/ui/ducks/index.js
index e976fa60e33d..145dd708cb90 100644
--- a/ui/ducks/index.js
+++ b/ui/ducks/index.js
@@ -11,6 +11,7 @@ import gasReducer from './gas/gas.duck';
 import { invalidCustomNetwork, unconnectedAccount } from './alerts';
 import swapsReducer from './swaps/swaps';
 import historyReducer from './history/history';
+import confirmAlertsReducer from './confirm-alerts/confirm-alerts';
 
 export default combineReducers({
   [AlertTypes.invalidCustomNetwork]: invalidCustomNetwork,
@@ -22,6 +23,7 @@ export default combineReducers({
   history: historyReducer,
   send: sendReducer,
   confirm: confirmReducer,
+  confirmAlerts: confirmAlertsReducer,
   confirmTransaction: confirmTransactionReducer,
   swaps: swapsReducer,
   gas: gasReducer,
diff --git a/ui/ducks/institutional/institutional.js b/ui/ducks/institutional/institutional.js
index a11613b326f2..ffb242e0978e 100644
--- a/ui/ducks/institutional/institutional.js
+++ b/ui/ducks/institutional/institutional.js
@@ -15,3 +15,8 @@ export default reducer;
 
 export const getInstitutionalConnectRequests = (state) =>
   state.metamask[name]?.connectRequests;
+
+export const getChannelId = (state) => state.metamask[name]?.channelId;
+
+export const getConnectionRequest = (state) =>
+  state.metamask[name]?.connectionRequest;
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index 95c290f0a040..ef45e19e7694 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -27,7 +27,6 @@ const initialState = {
   isUnlocked: false,
   isAccountMenuOpen: false,
   isNetworkMenuOpen: false,
-  identities: {},
   internalAccounts: { accounts: {}, selectedAccount: '' },
   transactions: [],
   networkConfigurations: {},
@@ -47,8 +46,10 @@ const initialState = {
     showExtensionInFullSizeView: false,
     showFiatInTestnets: false,
     showTestNetworks: false,
+    smartTransactionsOptInStatus: false,
     useNativeCurrencyAsPrimaryCurrency: true,
     petnamesEnabled: true,
+    featureNotificationsEnabled: false,
   },
   firstTimeFlowType: null,
   completedOnboarding: false,
@@ -97,9 +98,6 @@ export default function reduceMetamask(state = initialState, action) {
     case actionConstants.SET_ACCOUNT_LABEL: {
       const { account } = action.value;
       const name = action.value.label;
-      const id = {};
-      id[account] = { ...metamaskState.identities[account], name };
-      const identities = { ...metamaskState.identities, ...id };
       const accountToUpdate = Object.values(
         metamaskState.internalAccounts.accounts,
       ).find((internalAccount) => {
@@ -119,7 +117,7 @@ export default function reduceMetamask(state = initialState, action) {
           },
         },
       };
-      return Object.assign(metamaskState, { identities, internalAccounts });
+      return Object.assign(metamaskState, { internalAccounts });
     }
 
     case actionConstants.UPDATE_CUSTOM_NONCE:
@@ -190,6 +188,19 @@ export default function reduceMetamask(state = initialState, action) {
       };
     }
 
+    case actionConstants.RESET_ONBOARDING: {
+      return {
+        ...metamaskState,
+        completedOnboarding: false,
+        firstTimeFlowType: null,
+        isInitialized: false,
+        isUnlocked: false,
+        onboardingTabs: {},
+        seedPhraseBackedUp: null,
+        welcomeScreenSeen: false,
+      };
+    }
+
     case actionConstants.SET_FIRST_TIME_FLOW_TYPE: {
       return {
         ...metamaskState,
@@ -364,31 +375,85 @@ export function isEIP1559Network(state, networkClientId) {
   );
 }
 
-export function getGasEstimateType(state) {
+function getGasFeeControllerEstimateType(state) {
   return state.metamask.gasEstimateType;
 }
 
-export function getGasFeeControllerEstimates(state) {
+function getGasFeeControllerEstimateTypeByChainId(state, chainId) {
+  return state.metamask.gasFeeEstimatesByChainId?.[chainId]?.gasEstimateType;
+}
+
+function getGasFeeControllerEstimates(state) {
   return state.metamask.gasFeeEstimates;
 }
 
-export function getTransactionGasFeeEstimates(state) {
+function getGasFeeControllerEstimatesByChainId(state, chainId) {
+  return state.metamask.gasFeeEstimatesByChainId?.[chainId]?.gasFeeEstimates;
+}
+
+function getTransactionGasFeeEstimates(state) {
   const transactionMetadata = state.confirmTransaction?.txData;
   return transactionMetadata?.gasFeeEstimates;
 }
 
+function getTransactionGasFeeEstimatesByChainId(state, chainId) {
+  const transactionMetadata = state.confirmTransaction?.txData;
+  const transactionChainId = transactionMetadata?.chainId;
+
+  if (transactionChainId !== chainId) {
+    return undefined;
+  }
+
+  return transactionMetadata?.gasFeeEstimates;
+}
+
+const getTransactionGasFeeEstimateType = createSelector(
+  getTransactionGasFeeEstimates,
+  (transactionGasFeeEstimates) => transactionGasFeeEstimates?.type,
+);
+
+const getTransactionGasFeeEstimateTypeByChainId = createSelector(
+  getTransactionGasFeeEstimatesByChainId,
+  (transactionGasFeeEstimates) => transactionGasFeeEstimates?.type,
+);
+
+export const getGasEstimateType = createSelector(
+  getGasFeeControllerEstimateType,
+  getTransactionGasFeeEstimateType,
+  (gasFeeControllerEstimateType, transactionGasFeeEstimateType) => {
+    return transactionGasFeeEstimateType ?? gasFeeControllerEstimateType;
+  },
+);
+
+export const getGasEstimateTypeByChainId = createSelector(
+  getGasFeeControllerEstimateTypeByChainId,
+  getTransactionGasFeeEstimateTypeByChainId,
+  (gasFeeControllerEstimateType, transactionGasFeeEstimateType) => {
+    return transactionGasFeeEstimateType ?? gasFeeControllerEstimateType;
+  },
+);
+
+export const getGasFeeEstimatesByChainId = createSelector(
+  getGasFeeControllerEstimatesByChainId,
+  getTransactionGasFeeEstimatesByChainId,
+  (gasFeeControllerEstimates, transactionGasFeeEstimates) => {
+    if (transactionGasFeeEstimates) {
+      return mergeGasFeeEstimates({
+        gasFeeControllerEstimates,
+        transactionGasFeeEstimates,
+      });
+    }
+
+    return gasFeeControllerEstimates;
+  },
+);
+
 export const getGasFeeEstimates = createSelector(
-  getGasEstimateType,
   getGasFeeControllerEstimates,
   getTransactionGasFeeEstimates,
-  (
-    gasFeeControllerEstimateType,
-    gasFeeControllerEstimates,
-    transactionGasFeeEstimates,
-  ) => {
+  (gasFeeControllerEstimates, transactionGasFeeEstimates) => {
     if (transactionGasFeeEstimates) {
       return mergeGasFeeEstimates({
-        gasFeeControllerEstimateType,
         gasFeeControllerEstimates,
         transactionGasFeeEstimates,
       });
@@ -402,14 +467,6 @@ export function getEstimatedGasFeeTimeBounds(state) {
   return state.metamask.estimatedGasFeeTimeBounds;
 }
 
-export function getGasEstimateTypeByChainId(state, chainId) {
-  return state.metamask.gasFeeEstimatesByChainId?.[chainId]?.gasEstimateType;
-}
-
-export function getGasFeeEstimatesByChainId(state, chainId) {
-  return state.metamask.gasFeeEstimatesByChainId?.[chainId]?.gasFeeEstimates;
-}
-
 export function getEstimatedGasFeeTimeBoundsByChainId(state, chainId) {
   return state.metamask.gasFeeEstimatesByChainId?.[chainId]
     ?.estimatedGasFeeTimeBounds;
@@ -460,11 +517,6 @@ export function getIsGasEstimatesLoadingByChainId(
   return isGasEstimatesLoading;
 }
 
-export function getIsNetworkBusy(state) {
-  const gasFeeEstimates = getGasFeeEstimates(state);
-  return gasFeeEstimates?.networkCongestion >= NetworkCongestionThresholds.busy;
-}
-
 export function getIsNetworkBusyByChainId(state, chainId) {
   const gasFeeEstimates = getGasFeeEstimatesByChainId(state, chainId);
   return gasFeeEstimates?.networkCongestion >= NetworkCongestionThresholds.busy;
diff --git a/ui/ducks/metamask/metamask.test.js b/ui/ducks/metamask/metamask.test.js
index d02dc4c8d471..c8cbacc74ce4 100644
--- a/ui/ducks/metamask/metamask.test.js
+++ b/ui/ducks/metamask/metamask.test.js
@@ -2,6 +2,7 @@ import { NetworkType } from '@metamask/controller-utils';
 import { NetworkStatus } from '@metamask/network-controller';
 import { EthAccountType, EthMethod } from '@metamask/keyring-api';
 import {
+  GasFeeEstimateType,
   TransactionStatus,
   mergeGasFeeEstimates,
 } from '@metamask/transaction-controller';
@@ -10,13 +11,14 @@ import * as actionConstants from '../../store/actionConstants';
 import reduceMetamask, {
   getBlockGasLimit,
   getConversionRate,
-  getGasFeeControllerEstimates,
+  getGasEstimateType,
+  getGasEstimateTypeByChainId,
   getGasFeeEstimates,
-  getIsNetworkBusy,
+  getGasFeeEstimatesByChainId,
+  getIsNetworkBusyByChainId,
   getNativeCurrency,
   getSendHexDataFeatureFlagState,
   getSendToAccounts,
-  getTransactionGasFeeEstimates,
   isNotEIP1559Network,
 } from './metamask';
 
@@ -63,24 +65,6 @@ describe('MetaMask Reducers', () => {
         isInitialized: true,
         isUnlocked: true,
         featureFlags: { sendHexData: true },
-        identities: {
-          '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': {
-            address: '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825',
-            name: 'Send Account 1',
-          },
-          '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb': {
-            address: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-            name: 'Send Account 2',
-          },
-          '0x2f8d4a878cfa04a6e60d46362f5644deab66572d': {
-            address: '0x2f8d4a878cfa04a6e60d46362f5644deab66572d',
-            name: 'Send Account 3',
-          },
-          '0xd85a4b6a394794842887b8284293d69163007bbb': {
-            address: '0xd85a4b6a394794842887b8284293d69163007bbb',
-            name: 'Send Account 4',
-          },
-        },
         internalAccounts: {
           accounts: {
             'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -250,6 +234,10 @@ describe('MetaMask Reducers', () => {
     ),
   };
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('init state', () => {
     const initState = reduceMetamask(undefined, {});
 
@@ -259,7 +247,6 @@ describe('MetaMask Reducers', () => {
   it('locks MetaMask', () => {
     const unlockMetaMaskState = {
       isUnlocked: true,
-      selectedAddress: 'test address',
     };
     const lockMetaMask = reduceMetamask(unlockMetaMaskState, {
       type: actionConstants.LOCK_METAMASK,
@@ -277,16 +264,6 @@ describe('MetaMask Reducers', () => {
       },
     });
 
-    expect(state.identities).toStrictEqual({
-      ...mockState.metamask.identities,
-      '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': {
-        ...mockState.metamask.identities[
-          '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825'
-        ],
-        name: 'test label',
-      },
-    });
-
     expect(state.internalAccounts).toStrictEqual({
       ...mockState.metamask.internalAccounts,
       accounts: {
@@ -561,104 +538,273 @@ describe('MetaMask Reducers', () => {
     });
   });
 
-  describe('getIsNetworkBusy', () => {
-    it('should return true if state.metamask.gasFeeEstimates.networkCongestion is over the "busy" threshold', () => {
+  describe('getIsNetworkBusyByChainId', () => {
+    it('should return true if networkCongestion is over the "busy" threshold', () => {
       expect(
-        getIsNetworkBusy({
-          metamask: { gasFeeEstimates: { networkCongestion: 0.67 } },
-        }),
+        getIsNetworkBusyByChainId(
+          {
+            metamask: {
+              providerConfig: {
+                chainId: '0x2',
+              },
+              gasFeeEstimatesByChainId: {
+                '0x1': {
+                  gasFeeEstimates: { networkCongestion: 0.67 },
+                },
+              },
+            },
+          },
+          '0x1',
+        ),
       ).toBe(true);
     });
 
-    it('should return true if state.metamask.gasFeeEstimates.networkCongestion is right at the "busy" threshold', () => {
+    it('should return true if networkCongestion is right at the "busy" threshold', () => {
       expect(
-        getIsNetworkBusy({
-          metamask: { gasFeeEstimates: { networkCongestion: 0.66 } },
-        }),
+        getIsNetworkBusyByChainId(
+          {
+            metamask: {
+              providerConfig: {
+                chainId: '0x2',
+              },
+              gasFeeEstimatesByChainId: {
+                '0x1': {
+                  gasFeeEstimates: { networkCongestion: 0.66 },
+                },
+              },
+            },
+          },
+          '0x1',
+        ),
       ).toBe(true);
     });
 
-    it('should return false if state.metamask.gasFeeEstimates.networkCongestion is not over the "busy" threshold', () => {
+    it('should return false if networkCongestion is not over the "busy" threshold', () => {
       expect(
-        getIsNetworkBusy({
-          metamask: { gasFeeEstimates: { networkCongestion: 0.65 } },
-        }),
+        getIsNetworkBusyByChainId(
+          {
+            metamask: {
+              providerConfig: {
+                chainId: '0x2',
+              },
+              gasFeeEstimatesByChainId: {
+                '0x1': {
+                  gasFeeEstimates: { networkCongestion: 0.65 },
+                },
+              },
+            },
+          },
+          '0x1',
+        ),
       ).toBe(false);
     });
   });
 
-  describe('getGasFeeControllerEstimates', () => {
-    it('returns estimates from GasFeeController state', () => {
+  describe('getGasFeeEstimates', () => {
+    it('returns GasFeeController estimates if no transaction estimates', () => {
       const state = {
         metamask: {
           gasFeeEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
         },
       };
 
-      expect(getGasFeeControllerEstimates(state)).toStrictEqual(
+      expect(getGasFeeEstimates(state)).toStrictEqual(
         GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
       );
     });
-  });
 
-  describe('getTransactionGasFeeEstimates', () => {
-    it('returns estimates from transaction', () => {
+    it('returns merged transaction estimates if transaction estimates exist', () => {
       const state = {
         confirmTransaction: {
           txData: {
             gasFeeEstimates: TRANSACTION_ESTIMATES_MOCK,
           },
         },
+        metamask: {
+          gasFeeEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+        },
       };
 
-      expect(getTransactionGasFeeEstimates(state)).toStrictEqual(
+      mergeGasFeeEstimatesMock.mockReturnValue(TRANSACTION_ESTIMATES_MOCK);
+
+      expect(getGasFeeEstimates(state)).toStrictEqual(
         TRANSACTION_ESTIMATES_MOCK,
       );
-    });
 
-    it('returns undefined if no confirm transaction', () => {
-      expect(getTransactionGasFeeEstimates({})).toBeUndefined();
+      expect(mergeGasFeeEstimatesMock).toHaveBeenCalledTimes(1);
+      expect(mergeGasFeeEstimatesMock).toHaveBeenCalledWith({
+        gasFeeControllerEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+        transactionGasFeeEstimates: TRANSACTION_ESTIMATES_MOCK,
+      });
     });
   });
 
-  describe('getGasFeeEstimates', () => {
-    it('returns GasFeeController estimates if no transaction estimates', () => {
+  describe('getGasFeeEstimatesByChainId', () => {
+    it('returns GasFeeController estimates for specified chain if no transaction estimates', () => {
       const state = {
         metamask: {
-          gasFeeEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+          gasFeeEstimatesByChainId: {
+            '0x1': {
+              gasFeeEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+            },
+          },
         },
       };
 
-      expect(getGasFeeEstimates(state)).toStrictEqual(
+      expect(getGasFeeEstimatesByChainId(state, '0x1')).toStrictEqual(
         GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
       );
     });
 
-    it('returns merged transaction estimates if transaction estimates and GasFeeController estimates', () => {
+    it('returns merged transaction estimates if transaction estimates exist', () => {
       const state = {
         confirmTransaction: {
           txData: {
+            chainId: '0x1',
             gasFeeEstimates: TRANSACTION_ESTIMATES_MOCK,
           },
         },
         metamask: {
-          gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,
-          gasFeeEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+          gasFeeEstimatesByChainId: {
+            '0x1': {
+              gasFeeEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+            },
+          },
         },
       };
 
       mergeGasFeeEstimatesMock.mockReturnValue(TRANSACTION_ESTIMATES_MOCK);
 
-      expect(getGasFeeEstimates(state)).toStrictEqual(
+      expect(getGasFeeEstimatesByChainId(state, '0x1')).toStrictEqual(
         TRANSACTION_ESTIMATES_MOCK,
       );
 
       expect(mergeGasFeeEstimatesMock).toHaveBeenCalledTimes(1);
       expect(mergeGasFeeEstimatesMock).toHaveBeenCalledWith({
-        gasFeeControllerEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,
         gasFeeControllerEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
         transactionGasFeeEstimates: TRANSACTION_ESTIMATES_MOCK,
       });
     });
+
+    it('returns GasFeeController estimates for specified chain if transaction chain does not match', () => {
+      const state = {
+        confirmTransaction: {
+          txData: {
+            chainId: '0x2',
+            gasFeeEstimates: TRANSACTION_ESTIMATES_MOCK,
+          },
+        },
+        metamask: {
+          gasFeeEstimatesByChainId: {
+            '0x1': {
+              gasFeeEstimates: GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+            },
+          },
+        },
+      };
+
+      expect(getGasFeeEstimatesByChainId(state, '0x1')).toStrictEqual(
+        GAS_FEE_CONTROLLER_ESTIMATES_MOCK,
+      );
+    });
+  });
+
+  describe('getGasEstimateType', () => {
+    it('return GasFeeController type if no transaction estimates', () => {
+      const state = {
+        metamask: {
+          gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,
+        },
+      };
+
+      expect(getGasEstimateType(state)).toStrictEqual(
+        GAS_ESTIMATE_TYPES.FEE_MARKET,
+      );
+    });
+
+    it('return transaction type if transaction estimates exist', () => {
+      const state = {
+        metamask: {
+          gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,
+        },
+        confirmTransaction: {
+          txData: {
+            gasFeeEstimates: {
+              type: GasFeeEstimateType.Legacy,
+            },
+          },
+        },
+      };
+
+      expect(getGasEstimateType(state)).toStrictEqual(
+        GAS_ESTIMATE_TYPES.LEGACY,
+      );
+    });
+  });
+
+  describe('getGasEstimateTypeByChainId', () => {
+    it('return GasFeeController type for specified chain if no transaction estimates', () => {
+      const state = {
+        metamask: {
+          gasFeeEstimatesByChainId: {
+            '0x1': {
+              gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,
+            },
+          },
+        },
+      };
+
+      expect(getGasEstimateTypeByChainId(state, '0x1')).toStrictEqual(
+        GAS_ESTIMATE_TYPES.FEE_MARKET,
+      );
+    });
+
+    it('return transaction type if transaction estimates exist', () => {
+      const state = {
+        metamask: {
+          gasFeeEstimatesByChainId: {
+            '0x1': {
+              gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,
+            },
+          },
+        },
+        confirmTransaction: {
+          txData: {
+            chainId: '0x1',
+            gasFeeEstimates: {
+              type: GasFeeEstimateType.Legacy,
+            },
+          },
+        },
+      };
+
+      expect(getGasEstimateTypeByChainId(state, '0x1')).toStrictEqual(
+        GAS_ESTIMATE_TYPES.LEGACY,
+      );
+    });
+
+    it('return GasFeeController type if transaction chain does not match', () => {
+      const state = {
+        metamask: {
+          gasFeeEstimatesByChainId: {
+            '0x1': {
+              gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,
+            },
+          },
+        },
+        confirmTransaction: {
+          txData: {
+            chainId: '0x2',
+            gasFeeEstimates: {
+              type: GasFeeEstimateType.Legacy,
+            },
+          },
+        },
+      };
+
+      expect(getGasEstimateTypeByChainId(state, '0x1')).toStrictEqual(
+        GAS_ESTIMATE_TYPES.FEE_MARKET,
+      );
+    });
   });
 });
diff --git a/ui/ducks/send/helpers.js b/ui/ducks/send/helpers.js
index 607fdcda4c7a..8541f777dfd6 100644
--- a/ui/ducks/send/helpers.js
+++ b/ui/ducks/send/helpers.js
@@ -232,7 +232,7 @@ export function generateTransactionParams(sendState) {
       // populated with the user input provided in hex field.
       txParams.to = draftTransaction.recipient.address;
       txParams.value = draftTransaction.amount.value;
-      txParams.data = draftTransaction.userInputHexData ?? undefined;
+      txParams.data = draftTransaction.userInputHexData || '0x';
   }
 
   // We need to make sure that we only include the right gas fee fields
diff --git a/ui/ducks/send/helpers.test.js b/ui/ducks/send/helpers.test.js
index ec9454daf571..9a6e10b74cea 100644
--- a/ui/ducks/send/helpers.test.js
+++ b/ui/ducks/send/helpers.test.js
@@ -152,7 +152,7 @@ describe('Send Slice Helpers', () => {
       );
       expect(txParams).toStrictEqual({
         from: '0x00',
-        data: undefined,
+        data: '0x',
         to: BURN_ADDRESS,
         type: '0x0',
         value: '0x1',
@@ -189,7 +189,7 @@ describe('Send Slice Helpers', () => {
       });
       expect(txParams).toStrictEqual({
         from: '0x00',
-        data: undefined,
+        data: '0x',
         to: BURN_ADDRESS,
         type: '0x2',
         value: '0x1',
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index fe92cf727f25..3f67f763017a 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -40,7 +40,6 @@ import {
   getUseTokenDetection,
   getTokenList,
   getAddressBookEntryOrAccountName,
-  getIsMultiLayerFeeNetwork,
   getEnsResolutionByAddress,
   getSelectedAccount,
   getSelectedInternalAccount,
@@ -62,6 +61,7 @@ import {
   addTransactionAndRouteToConfirmationPage,
   updateTransactionSendFlowHistory,
   getCurrentNetworkEIP1559Compatibility,
+  getLayer1GasFee,
   gasFeeStopPollingByPollingToken,
   gasFeeStartPollingByNetworkClientId,
 } from '../../store/actions';
@@ -98,7 +98,6 @@ import {
   toChecksumHexAddress,
 } from '../../../shared/modules/hexstring-utils';
 import { isSmartContractAddress } from '../../helpers/utils/transactions.util';
-import fetchEstimatedL1Fee from '../../helpers/utils/optimism/fetchEstimatedL1Fee';
 
 import {
   AssetType,
@@ -460,7 +459,7 @@ export const initialState = {
   gasIsSetInModal: false,
   gasPriceEstimate: '0x0',
   gasLimitMinimum: GAS_LIMITS.SIMPLE,
-  gasTotalForLayer1: '0x0',
+  gasTotalForLayer1: null,
   recipientMode: RECIPIENT_SEARCH_MODES.CONTACT_LIST,
   recipientInput: '',
   selectedAccount: {
@@ -508,16 +507,14 @@ export const computeEstimatedGasLimit = createAsyncThunk(
     const draftTransaction =
       send.draftTransactions[send.currentTransactionUUID];
     const unapprovedTxs = getUnapprovedTransactions(state);
-    const isMultiLayerFeeNetwork = getIsMultiLayerFeeNetwork(state);
     const transaction = unapprovedTxs[draftTransaction.id];
     const isNonStandardEthChain = getIsNonStandardEthChain(state);
     const chainId = getCurrentChainId(state);
     const selectedAccount = getSelectedInternalAccountWithBalance(state);
 
-    let gasTotalForLayer1;
-    if (isMultiLayerFeeNetwork) {
-      gasTotalForLayer1 = await fetchEstimatedL1Fee(chainId, {
-        txParams: {
+    const gasTotalForLayer1 = await thunkApi.dispatch(
+      getLayer1GasFee({
+        transactionParams: {
           gasPrice: draftTransaction.gas.gasPrice,
           gas: draftTransaction.gas.gasLimit,
           to: draftTransaction.recipient.address?.toLowerCase(),
@@ -529,8 +526,9 @@ export const computeEstimatedGasLimit = createAsyncThunk(
           data: draftTransaction.userInputHexData,
           type: '0x0',
         },
-      });
-    }
+        chainId,
+      }),
+    );
 
     if (
       send.stage !== SEND_STAGES.EDIT ||
@@ -931,7 +929,7 @@ const slice = createSlice({
         const _gasTotal = new Numeric(
           draftTransaction.gas.gasTotal || '0x0',
           16,
-        ).add(new Numeric(state.gasTotalForLayer1 || '0x0', 16));
+        ).add(new Numeric(state.gasTotalForLayer1 ?? '0x0', 16));
 
         amount = new Numeric(draftTransaction.asset.balance, 16)
           .minus(_gasTotal)
@@ -1666,9 +1664,11 @@ const slice = createSlice({
               draftTransaction.asset.balance = action.payload.account.balance;
             }
 
-            // If selected account was changed and selected asset is a token then
-            // reset asset to native asset
-            if (draftTransaction?.asset.type === AssetType.token) {
+            // Reset to the native asset when the account is changed
+            if (
+              draftTransaction?.asset.type === AssetType.token ||
+              draftTransaction?.asset.type === AssetType.NFT
+            ) {
               draftTransaction.asset.type =
                 draftTransactionInitialState.asset.type;
               draftTransaction.asset.error =
@@ -2780,3 +2780,7 @@ export function isSendFormInvalid(state) {
 export function getSendStage(state) {
   return state[name].stage;
 }
+
+export function hasSendLayer1GasFee(state) {
+  return state[name].gasTotalForLayer1 !== null;
+}
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index 10cd15e52bb8..3521326c39da 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -144,6 +144,9 @@ describe('Send Slice', () => {
     jest
       .spyOn(Actions, 'updateTransactionGasFees')
       .mockImplementation(() => ({ type: 'UPDATE_TRANSACTION_GAS_FEES' }));
+    jest
+      .spyOn(Actions, 'getLayer1GasFee')
+      .mockReturnValue({ type: 'GET_LAYER_1_GAS_FEE' });
   });
 
   describe('Reducers', () => {
@@ -1207,7 +1210,7 @@ describe('Send Slice', () => {
         );
       });
       it('should reset to native asset on selectedAccount changed', () => {
-        const olderState = {
+        const olderState = (asset) => ({
           ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
           selectedAccount: {
             balance: '0x3',
@@ -1216,42 +1219,60 @@ describe('Send Slice', () => {
           draftTransactions: {
             'test-uuid': {
               ...draftTransactionInitialState,
-              asset: {
-                type: AssetType.token,
-                error: null,
-                details: {
-                  address: 'tokenAddress',
-                  symbol: 'tokenSymbol',
-                  decimals: 'tokenDecimals',
-                },
-                balance: '0x2',
-              },
+              asset,
             },
           },
-        };
+        });
 
-        const action = {
-          type: 'SELECTED_ACCOUNT_CHANGED',
-          payload: {
-            account: {
-              address: '0xDifferentAddress',
-              balance: '0x1',
+        const assets = [
+          {
+            type: AssetType.token,
+            error: null,
+            details: {
+              address: 'tokenAddress',
+              symbol: 'tokenSymbol',
+              decimals: 'tokenDecimals',
             },
+            balance: '0x2',
           },
-        };
+          {
+            type: AssetType.NFT,
+            details: {
+              standard: TokenStandard.ERC721,
+            },
+          },
+          {
+            type: AssetType.NFT,
+            details: {
+              standard: TokenStandard.ERC1155,
+            },
+          },
+        ];
 
-        const result = sendReducer(olderState, action);
-        expect(result.selectedAccount.balance).toStrictEqual(
-          action.payload.account.balance,
-        );
-        expect(result.selectedAccount.address).toStrictEqual(
-          action.payload.account.address,
-        );
+        for (let i = 0; i < assets.length; i++) {
+          const action = {
+            type: 'SELECTED_ACCOUNT_CHANGED',
+            payload: {
+              account: {
+                address: `0xAddress${i}`,
+                balance: `0x${i}`,
+              },
+            },
+          };
 
-        expect(result.draftTransactions['test-uuid'].asset).toStrictEqual({
-          ...draftTransactionInitialState.asset,
-          balance: action.payload.account.balance,
-        });
+          const result = sendReducer(olderState(assets[i]), action);
+          expect(result.selectedAccount.balance).toStrictEqual(
+            action.payload.account.balance,
+          );
+          expect(result.selectedAccount.address).toStrictEqual(
+            action.payload.account.address,
+          );
+
+          expect(result.draftTransactions['test-uuid'].asset).toStrictEqual({
+            ...draftTransactionInitialState.asset,
+            balance: action.payload.account.balance,
+          });
+        }
       });
 
       it('should gracefully handle missing account in payload', () => {
@@ -1393,8 +1414,6 @@ describe('Send Slice', () => {
                 status: NetworkStatus.Available,
               },
             },
-            selectedAddress: mockAddress1,
-            identities: { [mockAddress1]: { address: mockAddress1 } },
             internalAccounts: {
               accounts: {
                 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -1562,7 +1581,6 @@ describe('Send Slice', () => {
         const sendState = {
           metamask: {
             blockGasLimit: '',
-            selectedAddress: '',
             internalAccounts: {
               accounts: {
                 'mock-id': {
@@ -1625,10 +1643,11 @@ describe('Send Slice', () => {
         expect(actionResult[2].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[3].type).toStrictEqual(
+        expect(actionResult[3].type).toStrictEqual('GET_LAYER_1_GAS_FEE');
+        expect(actionResult[4].type).toStrictEqual(
           'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual(
           'send/computeEstimatedGasLimit/fulfilled',
         );
       });
@@ -1637,7 +1656,6 @@ describe('Send Slice', () => {
         const sendState = {
           metamask: {
             blockGasLimit: '',
-            selectedAddress: '',
             internalAccounts: {
               accounts: {
                 'mock-id': {
@@ -1714,7 +1732,6 @@ describe('Send Slice', () => {
         const sendState = {
           metamask: {
             blockGasLimit: '',
-            selectedAddress: '',
             internalAccounts: {
               accounts: {
                 'mock-id': {
@@ -1776,10 +1793,11 @@ describe('Send Slice', () => {
         expect(actionResult[2].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[3].type).toStrictEqual(
+        expect(actionResult[3].type).toStrictEqual('GET_LAYER_1_GAS_FEE');
+        expect(actionResult[4].type).toStrictEqual(
           'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual(
           'send/computeEstimatedGasLimit/fulfilled',
         );
       });
@@ -1788,7 +1806,6 @@ describe('Send Slice', () => {
         const tokenAssetTypeSendState = {
           metamask: {
             blockGasLimit: '',
-            selectedAddress: '',
             internalAccounts: {
               accounts: {
                 'mock-id': {
@@ -1836,16 +1853,17 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(5);
+        expect(actionResult).toHaveLength(6);
         expect(actionResult[0].type).toStrictEqual('send/addHistoryEntry');
         expect(actionResult[1].type).toStrictEqual('send/updateSendAmount');
         expect(actionResult[2].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[3].type).toStrictEqual(
+        expect(actionResult[3].type).toStrictEqual('GET_LAYER_1_GAS_FEE');
+        expect(actionResult[4].type).toStrictEqual(
           'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual(
           'send/computeEstimatedGasLimit/fulfilled',
         );
       });
@@ -1855,7 +1873,6 @@ describe('Send Slice', () => {
       const defaultSendAssetState = {
         metamask: {
           blockGasLimit: '',
-          selectedAddress: '',
           internalAccounts: {
             accounts: {
               'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -1887,9 +1904,6 @@ describe('Send Slice', () => {
               address: '0x0',
             },
           },
-          identities: {
-            [mockAddress1]: {},
-          },
         },
         send: {
           ...getInitialSendStateWithExistingTxState({
@@ -1925,7 +1939,7 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(5);
+        expect(actionResult).toHaveLength(6);
 
         expect(actionResult[0]).toMatchObject({
           type: 'send/addHistoryEntry',
@@ -1945,10 +1959,11 @@ describe('Send Slice', () => {
         expect(actionResult[2].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[3].type).toStrictEqual(
+        expect(actionResult[3].type).toStrictEqual('GET_LAYER_1_GAS_FEE');
+        expect(actionResult[4].type).toStrictEqual(
           'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual(
           'send/computeEstimatedGasLimit/fulfilled',
         );
       });
@@ -1984,7 +1999,7 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(7);
+        expect(actionResult).toHaveLength(8);
         expect(actionResult[0].type).toStrictEqual('SHOW_LOADING_INDICATION');
         expect(actionResult[1].type).toStrictEqual('HIDE_LOADING_INDICATION');
         expect(actionResult[2]).toMatchObject({
@@ -2010,10 +2025,11 @@ describe('Send Slice', () => {
         expect(actionResult[4].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[5].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual('GET_LAYER_1_GAS_FEE');
+        expect(actionResult[6].type).toStrictEqual(
           'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[6].type).toStrictEqual(
+        expect(actionResult[7].type).toStrictEqual(
           'send/computeEstimatedGasLimit/fulfilled',
         );
       });
@@ -2207,7 +2223,6 @@ describe('Send Slice', () => {
         const updateRecipientState = {
           metamask: {
             addressBook: {},
-            identities: {},
             internalAccounts: {
               accounts: {},
               selectedAccount: '',
@@ -2319,13 +2334,11 @@ describe('Send Slice', () => {
         const tokenState = {
           metamask: {
             addressBook: {},
-            identities: {},
             internalAccounts: {
               accounts: {},
               selectedAccount: '',
             },
             blockGasLimit: '',
-            selectedAddress: '',
             providerConfig: {
               chainId: '0x1',
             },
@@ -2373,7 +2386,6 @@ describe('Send Slice', () => {
         const updateRecipientState = {
           metamask: {
             addressBook: {},
-            identities: {},
             providerConfig: {
               chainId: '',
             },
@@ -2432,7 +2444,7 @@ describe('Send Slice', () => {
         await store.dispatch(resetRecipientInput());
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(12);
+        expect(actionResult).toHaveLength(13);
         expect(actionResult[0]).toMatchObject({
           type: 'send/addHistoryEntry',
           payload: 'sendFlow - user cleared recipient input',
@@ -2457,16 +2469,17 @@ describe('Send Slice', () => {
         expect(actionResult[7].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[8].type).toStrictEqual(
+        expect(actionResult[8].type).toStrictEqual('GET_LAYER_1_GAS_FEE');
+        expect(actionResult[9].type).toStrictEqual(
           'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[9].type).toStrictEqual(
+        expect(actionResult[10].type).toStrictEqual(
           'send/computeEstimatedGasLimit/fulfilled',
         );
-        expect(actionResult[10].type).toStrictEqual(
+        expect(actionResult[11].type).toStrictEqual(
           'DNS/resetDomainResolution',
         );
-        expect(actionResult[11].type).toStrictEqual(
+        expect(actionResult[12].type).toStrictEqual(
           'send/validateRecipientUserInput',
         );
       });
@@ -2602,7 +2615,7 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(6);
+        expect(actionResult).toHaveLength(7);
         expect(actionResult[0].type).toStrictEqual('send/updateAmountMode');
         expect(actionResult[1].type).toStrictEqual('send/updateSendAmount');
         expect(actionResult[2]).toMatchObject({
@@ -2612,10 +2625,11 @@ describe('Send Slice', () => {
         expect(actionResult[3].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[4].type).toStrictEqual('GET_LAYER_1_GAS_FEE');
+        expect(actionResult[5].type).toStrictEqual(
           'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[5].type).toStrictEqual(
+        expect(actionResult[6].type).toStrictEqual(
           'send/computeEstimatedGasLimit/fulfilled',
         );
       });
@@ -2767,9 +2781,6 @@ describe('Send Slice', () => {
             addressBook: {
               [CHAIN_IDS.GOERLI]: {},
             },
-            identities: {
-              [mockAddress1]: {},
-            },
             internalAccounts: {
               accounts: {
                 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -2926,7 +2937,6 @@ describe('Send Slice', () => {
         const editTransactionState = {
           metamask: {
             blockGasLimit: '0x3a98',
-            selectedAddress: '',
             providerConfig: {
               chainId: CHAIN_IDS.GOERLI,
             },
@@ -2934,9 +2944,6 @@ describe('Send Slice', () => {
             addressBook: {
               [CHAIN_IDS.GOERLI]: {},
             },
-            identities: {
-              [mockAddress1]: {},
-            },
             accounts: {
               [mockAddress1]: {
                 address: mockAddress1,
@@ -3130,7 +3137,6 @@ describe('Send Slice', () => {
       const editTransactionState = {
         metamask: {
           blockGasLimit: '0x3a98',
-          selectedAddress: '',
           internalAccounts: {
             accounts: {
               'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -3167,9 +3173,6 @@ describe('Send Slice', () => {
           addressBook: {
             [CHAIN_IDS.GOERLI]: {},
           },
-          identities: {
-            [mockAddress1]: {},
-          },
           accounts: {
             [mockAddress1]: {
               address: mockAddress1,
@@ -3598,7 +3601,6 @@ describe('Send Slice', () => {
             send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
             metamask: {
               ensResolutionsByAddress: {},
-              identities: {},
               internalAccounts: {
                 accounts: {},
                 selectedAccount: '',
@@ -3618,7 +3620,6 @@ describe('Send Slice', () => {
             metamask: {
               ensResolutionsByAddress: {},
               addressBook: {},
-              identities: {},
               internalAccounts: {
                 accounts: {},
                 selectedAccount: '',
@@ -3669,7 +3670,6 @@ describe('Send Slice', () => {
             send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
             metamask: {
               ensResolutionsByAddress: {},
-              identities: {},
               internalAccounts: {
                 accounts: {},
                 selectedAccount: '',
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index 683af33ef0c4..56a7273e8d5b 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -60,12 +60,15 @@ import {
   getSwapsDefaultToken,
   getCurrentChainId,
   isHardwareWallet,
-  accountSupportsSmartTx,
   getHardwareWalletType,
   checkNetworkAndAccountSupports1559,
   getSelectedNetworkClientId,
+  getSelectedInternalAccount,
 } from '../../selectors';
-
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../shared/modules/selectors';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -322,24 +325,6 @@ export const getSmartTransactionsError = (state) =>
 export const getSmartTransactionsErrorMessageDismissed = (state) =>
   state.appState.smartTransactionsErrorMessageDismissed;
 
-export const getSmartTransactionsEnabled = (state) => {
-  const supportedAccount = accountSupportsSmartTx(state);
-  const chainId = getCurrentChainId(state);
-  const isAllowedNetwork =
-    ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS.includes(chainId);
-  const smartTransactionsFeatureFlagEnabled =
-    state.metamask.swapsState?.swapsFeatureFlags?.smartTransactions
-      ?.extensionActive;
-  const smartTransactionsLiveness =
-    state.metamask.smartTransactionsState?.liveness;
-  return Boolean(
-    isAllowedNetwork &&
-      supportedAccount &&
-      smartTransactionsFeatureFlagEnabled &&
-      smartTransactionsLiveness,
-  );
-};
-
 export const getCurrentSmartTransactionsEnabled = (state) => {
   const smartTransactionsEnabled = getSmartTransactionsEnabled(state);
   const currentSmartTransactionsError = getCurrentSmartTransactionsError(state);
@@ -434,10 +419,6 @@ export const getApproveTxParams = (state) => {
   return { ...approvalNeeded, gasPrice, data };
 };
 
-export const getSmartTransactionsOptInStatus = (state) => {
-  return state.metamask.smartTransactionsState?.userOptInV2;
-};
-
 export const getCurrentSmartTransactions = (state) => {
   return state.metamask.smartTransactionsState?.smartTransactions?.[
     getCurrentChainId(state)
@@ -604,7 +585,7 @@ export const fetchSwapsLivenessAndFeatureFlags = () => {
         await dispatch(fetchSmartTransactionsLiveness());
         const transactions = await getTransactions({
           searchCriteria: {
-            from: state.metamask?.selectedAddress,
+            from: getSelectedInternalAccount(state)?.address,
           },
         });
         disableStxIfRegularTxInProgress(dispatch, transactions);
diff --git a/ui/ducks/swaps/swaps.test.js b/ui/ducks/swaps/swaps.test.js
index ab9dd7929c6b..1d01b770a2b0 100644
--- a/ui/ducks/swaps/swaps.test.js
+++ b/ui/ducks/swaps/swaps.test.js
@@ -6,6 +6,7 @@ import { MOCKS, createSwapsMockStore } from '../../../test/jest';
 import { setSwapsLiveness, setSwapsFeatureFlags } from '../../store/actions';
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import { setStorageItem } from '../../../shared/lib/storage-helpers';
+import { createMockInternalAccount } from '../../../test/jest/mocks';
 import swapsReducer, * as swaps from './swaps';
 
 const middleware = [thunk];
@@ -62,10 +63,18 @@ describe('Ducks - Swaps', () => {
     };
 
     const createGetState = () => {
+      const mockInternalAccount = createMockInternalAccount();
+
       return () => ({
         metamask: {
           providerConfig: { ...providerConfigState },
           from: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
+          internalAccounts: {
+            accounts: {
+              [mockInternalAccount.id]: mockInternalAccount,
+            },
+            selectedAccount: mockInternalAccount.id,
+          },
         },
       });
     };
@@ -401,64 +410,6 @@ describe('Ducks - Swaps', () => {
     });
   });
 
-  describe('getSmartTransactionsEnabled', () => {
-    it('returns true if feature flag is enabled, not a HW and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(true);
-    });
-
-    it('returns false if feature flag is disabled, not a HW and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.swapsState.swapsFeatureFlags.smartTransactions.extensionActive = false;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, not a HW, STX liveness is false and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.smartTransactionsState.liveness = false;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, is a HW and is Ethereum network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.internalAccounts.accounts[
-        state.metamask.internalAccounts.selectedAccount
-      ].metadata.keyring.type = 'Trezor Hardware';
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, not a HW and is Polygon network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.providerConfig.chainId = CHAIN_IDS.POLYGON;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if feature flag is enabled, not a HW and is BSC network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.providerConfig.chainId = CHAIN_IDS.BSC;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns true if feature flag is enabled, not a HW and is Goerli network', () => {
-      const state = createSwapsMockStore();
-      state.metamask.providerConfig.chainId = CHAIN_IDS.GOERLI;
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(true);
-    });
-
-    it('returns false if feature flag is missing', () => {
-      const state = createSwapsMockStore();
-      state.metamask.swapsState.swapsFeatureFlags = {};
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-
-    it('returns false if a snap account is used', () => {
-      const state = createSwapsMockStore();
-      state.metamask.internalAccounts.selectedAccount =
-        '36eb02e0-7925-47f0-859f-076608f09b69';
-      expect(swaps.getSmartTransactionsEnabled(state)).toBe(false);
-    });
-  });
-
   describe('getCurrentSmartTransactionsEnabled', () => {
     it('returns true if STX are enabled and there is no current STX error', () => {
       const state = createSwapsMockStore();
@@ -687,13 +638,6 @@ describe('Ducks - Swaps', () => {
     });
   });
 
-  describe('getSmartTransactionsOptInStatus', () => {
-    it('returns STX opt in status', () => {
-      const state = createSwapsMockStore();
-      expect(swaps.getSmartTransactionsOptInStatus(state)).toBe(true);
-    });
-  });
-
   describe('getCurrentSmartTransactions', () => {
     it('returns current smart transactions', () => {
       const state = createSwapsMockStore();
diff --git a/ui/helpers/constants/common.ts b/ui/helpers/constants/common.ts
index 9df9eb95368f..fec96f08aad7 100644
--- a/ui/helpers/constants/common.ts
+++ b/ui/helpers/constants/common.ts
@@ -23,3 +23,37 @@ export const OUTDATED_BROWSER_VERSIONS = {
   // See https://en.wikipedia.org/wiki/History_of_the_Opera_web_browser
   opera: '<76',
 };
+
+/**
+ * Specifies the browser and their versions where a regression in the extension port
+ * stream established between the contentscript and background was breaking for
+ * prerendered pages.
+ *
+ * @see {@link https://issues.chromium.org/issues/40273420}
+ */
+export const BROKEN_PRERENDER_BROWSER_VERSIONS = {
+  chrome: '>=113',
+  edge: '>=113',
+};
+
+/**
+ * Specifies the browser and their versions on a specific OS where a fix for the
+ * prerender regression specified in BROKEN_PRERENDER_BROWSER_VERSIONS was resolved.
+ *
+ * @see {@link https://chromium.googlesource.com/chromium/src/+/a88eee8a2798c1dc4d69b255ccad24fea5ff2d8b}
+ */
+export const FIXED_PRERENDER_BROWSER_VERSIONS = {
+  // https://chromiumdash.appspot.com/commits?commit=a88eee8a2798c1dc4d69b255ccad24fea5ff2d8b&platform=Windows
+  windows: {
+    chrome: '>=120',
+    edge: '>=120',
+  },
+  // https://chromiumdash.appspot.com/commits?commit=a88eee8a2798c1dc4d69b255ccad24fea5ff2d8b&platform=Mac
+  macos: {
+    chrome: '>=120',
+    edge: '>=120',
+  },
+  // https://chromiumdash.appspot.com/commits?commit=a88eee8a2798c1dc4d69b255ccad24fea5ff2d8b&platform=Linux
+  chrome: '>=121',
+  edge: '>=121',
+};
diff --git a/ui/helpers/constants/routes.ts b/ui/helpers/constants/routes.ts
index 1ba44c29f6d3..8de052feaa7d 100644
--- a/ui/helpers/constants/routes.ts
+++ b/ui/helpers/constants/routes.ts
@@ -5,6 +5,8 @@ const ASSET_ROUTE = '/asset';
 const SETTINGS_ROUTE = '/settings';
 const GENERAL_ROUTE = '/settings/general';
 const ADVANCED_ROUTE = '/settings/advanced';
+
+const DEVELOPER_OPTIONS_ROUTE = '/settings/developer-options';
 const EXPERIMENTAL_ROUTE = '/settings/experimental';
 const SECURITY_ROUTE = '/settings/security';
 const ABOUT_US_ROUTE = '/settings/about-us';
@@ -34,6 +36,7 @@ const CUSTODY_ACCOUNT_DONE_ROUTE = '/new-account/custody/done';
 const CONFIRM_ADD_CUSTODIAN_TOKEN = '/confirm-add-custodian-token';
 const INTERACTIVE_REPLACEMENT_TOKEN_PAGE =
   '/interactive-replacement-token-page';
+const SRP_REMINDER = '/onboarding/remind-srp';
 ///: END:ONLY_INCLUDE_IF
 const SEND_ROUTE = '/send';
 const CONNECTIONS = '/connections';
@@ -114,6 +117,8 @@ const PATH_NAME_MAP = {
   [SETTINGS_ROUTE]: 'Settings Page',
   [GENERAL_ROUTE]: 'General Settings Page',
   [ADVANCED_ROUTE]: 'Advanced Settings Page',
+  // DEVELOPER_OPTIONS_ROUTE not included because we're not tracking analytics for this page
+  // [DEVELOPER_OPTIONS_ROUTE]: 'Experimental Settings Page',
   [EXPERIMENTAL_ROUTE]: 'Experimental Settings Page',
   [SECURITY_ROUTE]: 'Security Settings Page',
   [ABOUT_US_ROUTE]: 'About Us Page',
@@ -152,6 +157,7 @@ const PATH_NAME_MAP = {
   [CUSTODY_ACCOUNT_DONE_ROUTE]: 'Connect Custody Account done',
   [CONFIRM_ADD_CUSTODIAN_TOKEN]: 'Confirm Add Custodian Token',
   [INTERACTIVE_REPLACEMENT_TOKEN_PAGE]: 'Interactive replacement token page',
+  [SRP_REMINDER]: 'Secret Recovery Phrase Reminder',
   ///: END:ONLY_INCLUDE_IF
   [SEND_ROUTE]: 'Send Page',
   [CONNECTIONS]: 'Connections',
@@ -235,6 +241,7 @@ export {
   ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
   CONFIRMATION_V_NEXT_ROUTE,
   ADVANCED_ROUTE,
+  DEVELOPER_OPTIONS_ROUTE,
   EXPERIMENTAL_ROUTE,
   SECURITY_ROUTE,
   GENERAL_ROUTE,
@@ -249,6 +256,7 @@ export {
   INSTITUTIONAL_FEATURES_DONE_ROUTE,
   CONFIRM_ADD_CUSTODIAN_TOKEN,
   INTERACTIVE_REPLACEMENT_TOKEN_PAGE,
+  SRP_REMINDER,
   ///: END:ONLY_INCLUDE_IF
   NETWORKS_ROUTE,
   NETWORKS_FORM_ROUTE,
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index cdac83191f75..1fced9db267a 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 import { IconName } from '../../components/component-library';
 import {
   ALERTS_ROUTE,
@@ -8,6 +9,7 @@ import {
   NETWORKS_ROUTE,
   CONTACT_LIST_ROUTE,
   EXPERIMENTAL_ROUTE,
+  DEVELOPER_OPTIONS_ROUTE,
 } from './routes';
 
 /**
@@ -21,7 +23,7 @@ import {
  */
 
 /** @type {SettingRouteConfig[]} */
-export const SETTINGS_CONSTANTS = [
+const SETTINGS_CONSTANTS = [
   {
     tabMessage: (t) => t('general'),
     sectionMessage: (t) => t('currencyConversion'),
@@ -78,6 +80,13 @@ export const SETTINGS_CONSTANTS = [
     route: `${ADVANCED_ROUTE}#clear-activity`,
     icon: 'fas fa-sliders-h',
   },
+  {
+    tabMessage: (t) => t('advanced'),
+    sectionMessage: (t) => t('smartTransactions'),
+    descriptionMessage: (t) => t('stxOptInDescription'),
+    route: `${ADVANCED_ROUTE}#smart-transactions`,
+    icon: 'fas fa-upload',
+  },
   {
     tabMessage: (t) => t('advanced'),
     sectionMessage: (t) => t('showHexData'),
@@ -439,6 +448,13 @@ export const SETTINGS_CONSTANTS = [
     route: `${EXPERIMENTAL_ROUTE}#nicknames`,
     icon: 'fas fa-flask',
   },
+  {
+    tabMessage: (t) => t('experimental'),
+    sectionMessage: (t) => t('notificationsFeatureToggle'),
+    descriptionMessage: (t) => t('notificationsFeatureToggleDescription'),
+    route: `${EXPERIMENTAL_ROUTE}#notifications`,
+    icon: 'fas fa-flask',
+  },
 
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   // since this route is only included with keyring-snaps feature flag, this needs to be the last settingsRef for the experimental tab
@@ -451,4 +467,51 @@ export const SETTINGS_CONSTANTS = [
     icon: 'fas fa-flask',
   },
   ///: END:ONLY_INCLUDE_IF
+
+  // developerOptions settingsRefs[0]
+  {
+    featureFlag: 'ENABLE_SETTINGS_PAGE_DEV_OPTIONS',
+    tabMessage: (t) => t('developerOptions'),
+    sectionMessage: (t) => t('resetStates'),
+    descriptionMessage: (t) => t('resetStates'),
+    route: `${DEVELOPER_OPTIONS_ROUTE}#reset-states`,
+    icon: IconName.CodeCircle,
+  },
+  // developerOptions settingsRefs[1]
+  {
+    featureFlag: 'ENABLE_SETTINGS_PAGE_DEV_OPTIONS',
+    tabMessage: (t) => t('developerOptions'),
+    sectionMessage: (t) => t('announcements'),
+    descriptionMessage: (t) =>
+      t('developerOptionsResetStatesAnnouncementsDescription'),
+    route: `${DEVELOPER_OPTIONS_ROUTE}#reset-states-announcements`,
+    icon: IconName.CodeCircle,
+  },
+  // developerOptions settingsRefs[2]
+  {
+    featureFlag: 'ENABLE_SETTINGS_PAGE_DEV_OPTIONS',
+    tabMessage: (t) => t('developerOptions'),
+    sectionMessage: (t) => t('serviceWorkerKeepAlive'),
+    descriptionMessage: (t) => t('developerOptionsResetStatesOnboarding'),
+    route: `${DEVELOPER_OPTIONS_ROUTE}#reset-states-onboarding`,
+    icon: IconName.CodeCircle,
+  },
+  // developerOptions settingsRefs[3]
+  {
+    featureFlag: 'ENABLE_SETTINGS_PAGE_DEV_OPTIONS',
+    tabMessage: (t) => t('developerOptions'),
+    sectionMessage: (t) => t('serviceWorkerKeepAlive'),
+    descriptionMessage: (t) => t('developerOptionsServiceWorkerKeepAlive'),
+    route: `${DEVELOPER_OPTIONS_ROUTE}#service-worker-keep-alive`,
+    icon: IconName.CodeCircle,
+  },
+  {
+    tabMessage: (t) => t('experimental'),
+    sectionMessage: (t) => t('redesignedConfirmationsEnabledToggle'),
+    descriptionMessage: (t) => t('redesignedConfirmationsToggleDescription'),
+    route: `${EXPERIMENTAL_ROUTE}#redesigned-confirmations`,
+    icon: 'fas fa-flask',
+  },
 ];
+
+export default SETTINGS_CONSTANTS;
diff --git a/ui/helpers/constants/snaps/delineator.ts b/ui/helpers/constants/snaps/delineator.ts
index f3ab5b3f164a..7ee388d25c11 100644
--- a/ui/helpers/constants/snaps/delineator.ts
+++ b/ui/helpers/constants/snaps/delineator.ts
@@ -4,9 +4,7 @@ export enum DelineatorType {
   Error = 'error',
   Insights = 'insights',
   Description = 'description',
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   Warning = 'warning',
-  ///: END:ONLY_INCLUDE_IF
 }
 
 export const getDelineatorTitle = (type: DelineatorType) => {
@@ -17,10 +15,8 @@ export const getDelineatorTitle = (type: DelineatorType) => {
       return 'insightsFromSnap';
     case DelineatorType.Description:
       return 'descriptionFromSnap';
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
     case DelineatorType.Warning:
       return 'warningFromSnap';
-    ///: END:ONLY_INCLUDE_IF
     default:
       return 'contentFromSnap';
   }
diff --git a/ui/helpers/utils/i18n-helper.tsx b/ui/helpers/utils/i18n-helper.tsx
index b639a158b312..eb53c9b5afd6 100644
--- a/ui/helpers/utils/i18n-helper.tsx
+++ b/ui/helpers/utils/i18n-helper.tsx
@@ -47,9 +47,6 @@ export const getMessage = (
 };
 
 export function getNetworkLabelKey(network: string): string {
-  if (network === NETWORK_TYPES.LINEA_GOERLI) {
-    return 'lineaGoerli';
-  }
   if (network === NETWORK_TYPES.LINEA_SEPOLIA) {
     return 'lineaSepolia';
   }
diff --git a/ui/helpers/utils/network-helper.test.ts b/ui/helpers/utils/network-helper.test.ts
new file mode 100644
index 000000000000..fef6711dbd93
--- /dev/null
+++ b/ui/helpers/utils/network-helper.test.ts
@@ -0,0 +1,79 @@
+import { getMatchedChain, getMatchedSymbols } from './network-helper';
+
+describe('netwotkHelper', () => {
+  describe('getMatchedChain', () => {
+    it('should return the matched chain for a given decimalChainId', () => {
+      const chains = [
+        {
+          chainId: '1',
+          name: 'Ethereum Mainnet',
+          nativeCurrency: { symbol: 'ETH' },
+        },
+        {
+          chainId: '3',
+          name: 'Ropsten Testnet',
+          nativeCurrency: { symbol: 'ETH' },
+        },
+      ];
+      const decimalChainId = '3';
+      const expected = {
+        chainId: '3',
+        name: 'Ropsten Testnet',
+        nativeCurrency: { symbol: 'ETH' },
+      };
+
+      const result = getMatchedChain(decimalChainId, chains);
+
+      expect(result).toEqual(expected);
+    });
+
+    it('should return undefined if no chain matches the given decimalChainId', () => {
+      const chains = [
+        {
+          chainId: '1',
+          name: 'Ethereum Mainnet',
+          nativeCurrency: { symbol: 'ETH' },
+        },
+        {
+          chainId: '3',
+          name: 'Ropsten Testnet',
+          nativeCurrency: { symbol: 'ETH' },
+        },
+      ];
+      const decimalChainId = '4'; // No matching chainId
+
+      const result = getMatchedChain(decimalChainId, chains);
+
+      expect(result).toBeUndefined();
+    });
+  });
+
+  describe('getMatchedSymbols', () => {
+    it('should return an array of symbols that match the given decimalChainId', () => {
+      const chains = [
+        { chainId: '1', name: 'test', nativeCurrency: { symbol: 'ETH' } },
+        { chainId: '3', name: 'test', nativeCurrency: { symbol: 'tETH' } },
+        { chainId: '1', name: 'test', nativeCurrency: { symbol: 'WETH' } },
+      ];
+      const decimalChainId = '1';
+      const expected = ['ETH', 'WETH'];
+
+      const result = getMatchedSymbols(decimalChainId, chains);
+
+      expect(result).toEqual(expect.arrayContaining(expected));
+      expect(result.length).toBe(expected.length);
+    });
+
+    it('should return an empty array if no symbols match the given decimalChainId', () => {
+      const chains = [
+        { chainId: '1', name: 'test', nativeCurrency: { symbol: 'ETH' } },
+        { chainId: '3', name: 'test', nativeCurrency: { symbol: 'tETH' } },
+      ];
+      const decimalChainId = '2'; // No matching chainId
+
+      const result = getMatchedSymbols(decimalChainId, chains);
+
+      expect(result).toEqual([]);
+    });
+  });
+});
diff --git a/ui/helpers/utils/network-helper.ts b/ui/helpers/utils/network-helper.ts
new file mode 100644
index 000000000000..840dc8dfbf8a
--- /dev/null
+++ b/ui/helpers/utils/network-helper.ts
@@ -0,0 +1,28 @@
+export const getMatchedChain = (
+  decimalChainId: string,
+  safeChainsList: {
+    chainId: string;
+    name: string;
+    nativeCurrency: { symbol: string };
+  }[],
+) => {
+  return safeChainsList.find(
+    (chain) => chain.chainId.toString() === decimalChainId,
+  );
+};
+
+export const getMatchedSymbols = (
+  decimalChainId: string,
+  safeChainsList: {
+    chainId: string;
+    name: string;
+    nativeCurrency: { symbol: string };
+  }[],
+): string[] => {
+  return safeChainsList.reduce<string[]>((accumulator, currentNetwork) => {
+    if (currentNetwork.chainId.toString() === decimalChainId) {
+      accumulator.push(currentNetwork.nativeCurrency?.symbol);
+    }
+    return accumulator;
+  }, []);
+};
diff --git a/ui/helpers/utils/optimism/buildUnserializedTransaction.js b/ui/helpers/utils/optimism/buildUnserializedTransaction.js
deleted file mode 100644
index 39d7a2c6f592..000000000000
--- a/ui/helpers/utils/optimism/buildUnserializedTransaction.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { omit } from 'lodash';
-import { BN } from 'ethereumjs-util';
-import { Common, Hardfork } from '@ethereumjs/common';
-import { TransactionFactory } from '@ethereumjs/tx';
-import { stripHexPrefix } from '../../../../shared/modules/hexstring-utils';
-
-function buildTxParams(txMeta) {
-  return {
-    ...omit(txMeta.txParams, 'gas'),
-    gasLimit: txMeta.txParams.gas,
-  };
-}
-
-function buildTransactionCommon(txMeta) {
-  // This produces a transaction whose information does not completely match an
-  // Optimism transaction — for instance, DEFAULT_CHAIN is still 'mainnet' and
-  // genesis points to the mainnet genesis, not the Optimism genesis — but
-  // considering that all we want to do is serialize a transaction, this works
-  // fine for our use case.
-  return Common.custom({
-    chainId: new BN(stripHexPrefix(txMeta.chainId), 16),
-    // Optimism only supports type-0 transactions; it does not support any of
-    // the newer EIPs since EIP-155. Source:
-    // <https://github.com/ethereum-optimism/optimism/blob/develop/specs/l2geth/transaction-types.md>
-    defaultHardfork: Hardfork.London,
-  });
-}
-
-export default function buildUnserializedTransaction(txMeta) {
-  const txParams = buildTxParams(txMeta);
-  const common = buildTransactionCommon(txMeta);
-  return TransactionFactory.fromTxData(txParams, { common });
-}
diff --git a/ui/helpers/utils/optimism/buildUnserializedTransaction.test.js b/ui/helpers/utils/optimism/buildUnserializedTransaction.test.js
deleted file mode 100644
index 5789e0f17929..000000000000
--- a/ui/helpers/utils/optimism/buildUnserializedTransaction.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { BN } from 'ethereumjs-util';
-import buildUnserializedTransaction from './buildUnserializedTransaction';
-
-describe('buildUnserializedTransaction', () => {
-  it('returns a transaction that can be serialized and fed to an Optimism smart contract', () => {
-    const unserializedTransaction = buildUnserializedTransaction({
-      txParams: {
-        nonce: '0x0',
-        gasPrice: `0x${new BN('100').toString(16)}`,
-        gas: `0x${new BN('21000').toString(16)}`,
-        to: '0x0000000000000000000000000000000000000000',
-        value: `0x${new BN('10000000000000').toString(16)}`,
-        data: '0x0',
-      },
-    });
-    expect(unserializedTransaction.toJSON()).toMatchObject({
-      nonce: '0x0',
-      gasPrice: '0x64',
-      gasLimit: '0x5208',
-      to: '0x0000000000000000000000000000000000000000',
-      value: '0x9184e72a000',
-      data: '0x00',
-    });
-  });
-});
diff --git a/ui/helpers/utils/optimism/fetchEstimatedL1Fee.js b/ui/helpers/utils/optimism/fetchEstimatedL1Fee.js
deleted file mode 100644
index c058e415834e..000000000000
--- a/ui/helpers/utils/optimism/fetchEstimatedL1Fee.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Contract } from '@ethersproject/contracts';
-import { Web3Provider } from '@ethersproject/providers';
-import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
-import buildUnserializedTransaction from './buildUnserializedTransaction';
-
-// Snippet of the ABI that we need
-// Should we need more of it at some point, the full ABI can be found here:
-// https://github.com/ethereum-optimism/optimism/blob/develop/gas-oracle/abis/OVM_GasPriceOracle.json
-const OPTIMISM_GAS_PRICE_ORACLE_ABI = [
-  {
-    inputs: [{ internalType: 'bytes', name: '_data', type: 'bytes' }],
-    name: 'getL1Fee',
-    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
-    stateMutability: 'view',
-    type: 'function',
-  },
-];
-
-// BlockExplorer link: https://optimistic.etherscan.io/address/0x420000000000000000000000000000000000000f#code
-const OPTIMISM_GAS_PRICE_ORACLE_ADDRESS =
-  '0x420000000000000000000000000000000000000F';
-
-export default async function fetchEstimatedL1Fee(
-  chainId,
-  txMeta,
-  ethersProvider,
-) {
-  const chainIdAsDecimalNumber = Number(hexToDecimal(chainId));
-  const provider = global.ethereumProvider
-    ? new Web3Provider(global.ethereumProvider, chainIdAsDecimalNumber)
-    : ethersProvider;
-
-  if (process.env.IN_TEST) {
-    provider.detectNetwork = async () => ({
-      name: 'optimism',
-      chainId: chainIdAsDecimalNumber,
-    });
-  }
-  const contract = new Contract(
-    OPTIMISM_GAS_PRICE_ORACLE_ADDRESS,
-    OPTIMISM_GAS_PRICE_ORACLE_ABI,
-    provider,
-  );
-  const serializedTransaction =
-    buildUnserializedTransaction(txMeta).serialize();
-  const result = await contract.getL1Fee(serializedTransaction);
-  return result?.toHexString();
-}
diff --git a/ui/helpers/utils/optimism/fetchEstimatedL1Fee.test.js b/ui/helpers/utils/optimism/fetchEstimatedL1Fee.test.js
deleted file mode 100644
index 65c37c7bae12..000000000000
--- a/ui/helpers/utils/optimism/fetchEstimatedL1Fee.test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { HttpProvider } from '@metamask/ethjs';
-import nock from 'nock';
-import { toHex } from '@metamask/controller-utils';
-import fetchEstimatedL1Fee from './fetchEstimatedL1Fee';
-
-describe('fetchEstimatedL1Fee', () => {
-  beforeAll(() => {
-    global.ethereumProvider = new HttpProvider(
-      'https://optimism-mainnet.public.blastapi.io',
-    );
-    nock.disableNetConnect();
-  });
-
-  it('returns an expected gasFee', async () => {
-    const expectedGasFeeResult = '377b09ef6660';
-    nock('https://optimism-mainnet.public.blastapi.io:443', {
-      encodedQueryParams: true,
-    })
-      .post('/', {
-        method: 'eth_call',
-        params: [
-          {
-            to: '0x420000000000000000000000000000000000000f',
-            data: '0x49948e0e00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023e280830f424082cf0894e7d522230eff653bb0a9b4385f0be0815420dd9880808080800000000000000000000000000000000000000000000000000000000000',
-          },
-          'latest',
-        ],
-        id: 1,
-        jsonrpc: '2.0',
-      })
-      .reply(200, {
-        jsonrpc: '2.0',
-        id: 1,
-        result: `0x0000000000000000000000000000000000000000000000000000${expectedGasFeeResult}`,
-      });
-
-    const gasFee = await fetchEstimatedL1Fee(toHex(10), {
-      txParams: {
-        gasPrice: '0xf4240',
-        gas: '0xcf08',
-        to: '0xe7d522230eff653bb0a9b4385f0be0815420dd98',
-        value: '0x0',
-        from: '0x806627172af48bd5b0765d3449a7def80d6576ff',
-        data: null,
-        type: '0x0',
-      },
-    });
-    expect(gasFee).toStrictEqual(`0x${expectedGasFeeResult}`);
-  });
-});
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index 2ab0ec076f27..052f09d676a1 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -19,8 +19,6 @@ import {
 } from '../../../shared/constants/permissions';
 import Tooltip from '../../components/ui/tooltip';
 import {
-  AvatarIcon,
-  AvatarIconSize,
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   Icon,
   Text,
@@ -45,18 +43,6 @@ const RIGHT_INFO_ICON = (
 );
 ///: END:ONLY_INCLUDE_IF
 
-function getLeftIcon(iconName) {
-  return (
-    <AvatarIcon
-      iconName={iconName}
-      size={AvatarIconSize.Sm}
-      iconProps={{
-        size: IconSize.Xs,
-      }}
-    />
-  );
-}
-
 function getSnapNameComponent(snapName) {
   return (
     <Text
@@ -72,8 +58,7 @@ function getSnapNameComponent(snapName) {
 export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [RestrictedMethods.eth_accounts]: ({ t }) => ({
     label: t('permission_ethereumAccounts'),
-    leftIcon: getLeftIcon(IconName.Eye),
-    rightIcon: null,
+    leftIcon: IconName.Eye,
     weight: 3,
   }),
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
@@ -273,7 +258,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [RestrictedMethods.wallet_snap]: ({ t, permissionValue, getSubjectName }) => {
     const snaps = permissionValue.caveats[0].value;
     const baseDescription = {
-      leftIcon: getLeftIcon(IconName.Flash),
+      leftIcon: IconName.Flash,
       rightIcon: RIGHT_INFO_ICON,
     };
 
@@ -501,7 +486,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
     description: t('permission_manageAccountsDescription', [
       getSnapNameComponent(subjectName),
     ]),
-    leftIcon: getLeftIcon(IconName.UserCircleAdd),
+    leftIcon: IconName.UserCircleAdd,
     rightIcon: null,
     weight: 3,
   }),
@@ -510,7 +495,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
     description: t('permission_keyringDescription', [
       getSnapNameComponent(subjectName),
     ]),
-    leftIcon: getLeftIcon(IconName.UserCircleAdd),
+    leftIcon: IconName.UserCircleAdd,
     rightIcon: null,
     weight: 3,
   }),
@@ -519,9 +504,10 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [EndowmentPermissions['endowment:name-lookup']]: ({ t }) => ({
     label: t('permission_nameLookup'),
     description: t('permission_nameLookupDescription'),
-    leftIcon: getLeftIcon(IconName.Search),
+    leftIcon: IconName.Search,
     weight: 4,
   }),
+  ///: END:ONLY_INCLUDE_IF
   [EndowmentPermissions['endowment:signature-insight']]: ({
     t,
     permissionValue,
@@ -560,10 +546,10 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
 
     return result;
   },
-  ///: END:ONLY_INCLUDE_IF
+
   [UNKNOWN_PERMISSION]: ({ t, permissionName }) => ({
     label: t('permission_unknown', [permissionName ?? 'undefined']),
-    leftIcon: getLeftIcon(IconName.Question),
+    leftIcon: IconName.Question,
     rightIcon: null,
     weight: 5,
   }),
diff --git a/ui/helpers/utils/settings-search.js b/ui/helpers/utils/settings-search.js
index 80e324b9b02b..447a39901059 100644
--- a/ui/helpers/utils/settings-search.js
+++ b/ui/helpers/utils/settings-search.js
@@ -1,5 +1,5 @@
 /* eslint-disable require-unicode-regexp */
-import { SETTINGS_CONSTANTS } from '../constants/settings';
+import SETTINGS_CONSTANTS from '../constants/settings';
 
 let settingsRoutes;
 
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index e8d5d7776124..89b885c87628 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { SETTINGS_CONSTANTS } from '../constants/settings';
+import SETTINGS_CONSTANTS from '../constants/settings';
 import {
   getSettingsRoutes,
   getNumberOfSettingRoutesInTab,
@@ -36,6 +36,8 @@ const t = (key) => {
       return 'Select this to show gas price and limit controls directly on the send and confirm screens.';
     case 'showHexData':
       return 'Show hex data';
+    case 'smartTransactions':
+      return 'Smart transactions';
     case 'showHexDataDescription':
       return 'Select this to show the hex data field on the send screen';
     case 'showFiatConversionInTestnets':
@@ -94,6 +96,8 @@ const t = (key) => {
       return 'Sepolia test network';
     case 'localhost':
       return 'Localhost 8545';
+    case 'developerOptions':
+      return 'Developer Options';
     case 'experimental':
       return 'Experimental';
     case 'autoDetectTokens':
@@ -142,7 +146,11 @@ const t = (key) => {
 describe('Settings Search Utils', () => {
   describe('getSettingsRoutes', () => {
     it('should be an array of settings routes objects', () => {
-      expect(getSettingsRoutes()).toHaveLength(SETTINGS_CONSTANTS.length);
+      const NUM_OF_ENV_FEATURE_FLAG_SETTINGS = 4;
+
+      expect(getSettingsRoutes()).toHaveLength(
+        SETTINGS_CONSTANTS.length - NUM_OF_ENV_FEATURE_FLAG_SETTINGS,
+      );
     });
   });
 
@@ -152,7 +160,7 @@ describe('Settings Search Utils', () => {
     });
 
     it('returns "Advanced" section count', () => {
-      expect(getNumberOfSettingRoutesInTab(t, t('advanced'))).toStrictEqual(12);
+      expect(getNumberOfSettingRoutesInTab(t, t('advanced'))).toStrictEqual(13);
     });
 
     it('returns "Contact" section count', () => {
@@ -175,10 +183,16 @@ describe('Settings Search Utils', () => {
 
     it('returns "Experimental" section count', () => {
       expect(getNumberOfSettingRoutesInTab(t, t('experimental'))).toStrictEqual(
-        2,
+        4,
       );
     });
 
+    it('returns 0 "Developer Options" section count when env flag is disabled', () => {
+      expect(
+        getNumberOfSettingRoutesInTab(t, t('developerOptions')),
+      ).toStrictEqual(0);
+    });
+
     it('returns "About" section count', () => {
       expect(getNumberOfSettingRoutesInTab(t, t('about'))).toStrictEqual(9);
     });
diff --git a/ui/helpers/utils/tx-helper.ts b/ui/helpers/utils/tx-helper.ts
index c9700a32f91e..c0e579885db9 100644
--- a/ui/helpers/utils/tx-helper.ts
+++ b/ui/helpers/utils/tx-helper.ts
@@ -2,13 +2,27 @@ import log from 'loglevel';
 import { valuesFor } from './util';
 
 export default function txHelper(
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   unapprovedTxs: Record<string, any> | null,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   unapprovedMsgs: Record<string, any> | null,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   personalMsgs: Record<string, any> | null,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   decryptMsgs: Record<string, any> | null,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   encryptionPublicKeyMsgs: Record<string, any> | null,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   typedMessages: Record<string, any> | null,
   chainId?: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): Record<string, any> {
   log.debug('tx-helper called with params:');
   log.debug({
diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index 6b90313e9945..1353f2703741 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -444,8 +444,8 @@ const SOLIDITY_TYPES = solidityTypes();
 const stripArrayType = (potentialArrayType) =>
   potentialArrayType.replace(/\[[[0-9]*\]*/gu, '');
 
-const stripOneLayerofNesting = (potentialArrayType) =>
-  potentialArrayType.replace(/\[[[0-9]*\]/u, '');
+export const stripOneLayerofNesting = (potentialArrayType) =>
+  potentialArrayType.replace(/\[(\d*)\]/u, '');
 
 const isArrayType = (potentialArrayType) =>
   potentialArrayType.match(/\[[[0-9]*\]*/u) !== null;
@@ -707,3 +707,16 @@ export const hexToText = (hex) => {
     return hex;
   }
 };
+
+/**
+ * Extract and return first character (letter or number) of a provided string.
+ * If not possible, return question mark.
+ * Note: This function is used for generating fallback avatars for different entities (websites, Snaps, etc.)
+ * Note: Only letters and numbers will be returned if possible (special characters are ignored).
+ *
+ * @param {string} subjectName - Name of a subject.
+ * @returns Single character, chosen from the first character or number, question mark otherwise.
+ */
+export const getAvatarFallbackLetter = (subjectName) => {
+  return subjectName?.match(/[a-z0-9]/iu)?.[0] ?? '?';
+};
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index 74606dfa266b..f51824b3d8e4 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -465,6 +465,14 @@ describe('util', () => {
       };
     });
 
+    it('should not be vulnerable to ReDoS when stripping nesting', () => {
+      const startTime = Date.now();
+      util.stripOneLayerofNesting(`${'['.repeat(90000)}|[]`);
+      const endTime = Date.now();
+      const executionTime = endTime - startTime;
+      expect(executionTime).toBeLessThan(3000);
+    });
+
     it('should throw an error if types is undefined', () => {
       expect(() =>
         util.sanitizeMessage(message, primaryType, undefined),
diff --git a/ui/hooks/experiences/useRamps.test.js b/ui/hooks/experiences/useRamps.test.js
index 18191b3792dd..dcb1dc2eb43c 100644
--- a/ui/hooks/experiences/useRamps.test.js
+++ b/ui/hooks/experiences/useRamps.test.js
@@ -1,46 +1,108 @@
+import React from 'react';
+import { Provider } from 'react-redux';
 import { renderHook } from '@testing-library/react-hooks';
-import { useSelector } from 'react-redux';
-import useRamps from './useRamps';
+import configureStore from '../../store/store';
+import useRamps, { RampsMetaMaskEntry } from './useRamps';
 
-jest.mock('react-redux');
+const mockedMetametricsId = '0xtestMetaMetricsId';
 
-jest.mock('./../../selectors', () => ({
-  getCurrentChainId: jest.fn(),
-}));
-
-jest.mock('../../../shared/constants/network', () => ({
-  CHAIN_IDS: {
-    GOERLI: '5',
-    SEPOLIA: '10',
-    MAINNET: '1',
+let mockStoreState = {
+  metamask: {
+    providerConfig: {
+      chainId: '0x1',
+    },
+    metaMetricsId: mockedMetametricsId,
   },
-}));
+};
+
+const wrapper = ({ children }) => (
+  <Provider store={configureStore(mockStoreState)}>{children}</Provider>
+);
 
 describe('useRamps', () => {
-  beforeAll(() => {
+  beforeEach(() => {
+    global.platform = { openTab: jest.fn() };
+  });
+
+  afterEach(() => {
     jest.clearAllMocks();
-    Object.defineProperty(global, 'platform', {
-      value: {
-        openTab: jest.fn(),
+  });
+
+  it('should default the metamask entry param when opening the buy crypto URL', () => {
+    const metaMaskEntry = 'ext_buy_sell_button';
+    const mockChainId = '0x1';
+
+    mockStoreState = {
+      ...mockStoreState,
+      metamask: {
+        ...mockStoreState.metamask,
+        providerConfig: {
+          chainId: mockChainId,
+        },
       },
+    };
+
+    const mockBuyURI = `${process.env.PORTFOLIO_URL}/buy?metamaskEntry=${metaMaskEntry}&chainId=${mockChainId}&metametricsId=${mockedMetametricsId}`;
+    const openTabSpy = jest.spyOn(global.platform, 'openTab');
+
+    const { result } = renderHook(() => useRamps(), { wrapper }); // default metamask entry
+
+    result.current.openBuyCryptoInPdapp();
+    expect(openTabSpy).toHaveBeenCalledWith({
+      url: mockBuyURI,
     });
   });
 
-  it('should open the buy crypto URL for MAINNET chain ID', () => {
-    const mockChainId = '1';
-    const mockBuyURI = `${process.env.PORTFOLIO_URL}/buy?metamaskEntry=ext_buy_sell_button&metametricsId=1`;
+  it('should use the correct metamask entry param when opening the buy crypto URL', () => {
+    const metaMaskEntry = 'ext_buy_banner_tokens';
+    const mockChainId = '0x1';
 
-    useSelector.mockReturnValue(mockChainId);
-    const openTabSpy = jest.spyOn(global.platform, 'openTab');
+    mockStoreState = {
+      ...mockStoreState,
+      metamask: {
+        ...mockStoreState.metamask,
+        providerConfig: {
+          chainId: mockChainId,
+        },
+      },
+    };
 
-    const { result } = renderHook(() => useRamps());
+    const mockBuyURI = `${process.env.PORTFOLIO_URL}/buy?metamaskEntry=${metaMaskEntry}&chainId=${mockChainId}&metametricsId=${mockedMetametricsId}`;
+    const openTabSpy = jest.spyOn(global.platform, 'openTab');
 
-    expect(typeof result.current.openBuyCryptoInPdapp).toBe('function');
+    const { result } = renderHook(
+      () => useRamps(RampsMetaMaskEntry.TokensBanner),
+      { wrapper },
+    );
 
     result.current.openBuyCryptoInPdapp();
-
     expect(openTabSpy).toHaveBeenCalledWith({
       url: mockBuyURI,
     });
   });
+
+  it.each(['0x1', '0x38', '0xa'])(
+    'should open the buy crypto URL with the currently connected chain ID',
+    (mockChainId) => {
+      mockStoreState = {
+        ...mockStoreState,
+        metamask: {
+          ...mockStoreState.metamask,
+          providerConfig: {
+            chainId: mockChainId,
+          },
+        },
+      };
+
+      const mockBuyURI = `${process.env.PORTFOLIO_URL}/buy?metamaskEntry=ext_buy_sell_button&chainId=${mockChainId}&metametricsId=${mockedMetametricsId}`;
+      const openTabSpy = jest.spyOn(global.platform, 'openTab');
+      const { result } = renderHook(() => useRamps(), { wrapper });
+
+      result.current.openBuyCryptoInPdapp();
+
+      expect(openTabSpy).toHaveBeenCalledWith({
+        url: mockBuyURI,
+      });
+    },
+  );
 });
diff --git a/ui/hooks/experiences/useRamps.ts b/ui/hooks/experiences/useRamps.ts
index a4a19e1a0a48..76bcdfe47879 100644
--- a/ui/hooks/experiences/useRamps.ts
+++ b/ui/hooks/experiences/useRamps.ts
@@ -9,17 +9,25 @@ type IUseRamps = {
   getBuyURI: (chainId: ChainId) => string;
 };
 
-const portfolioUrl = process.env.PORTFOLIO_URL;
+export enum RampsMetaMaskEntry {
+  BuySellButton = 'ext_buy_sell_button',
+  NftBanner = 'ext_buy_banner_nfts',
+  TokensBanner = 'ext_buy_banner_tokens',
+  ActivityBanner = 'ext_buy_banner_activity',
+}
 
-const useRamps = (): IUseRamps => {
+const portfolioUrl = process.env.PORTFOLIO_URL;
+const useRamps = (
+  metamaskEntry: RampsMetaMaskEntry = RampsMetaMaskEntry.BuySellButton,
+): IUseRamps => {
   const chainId = useSelector(getCurrentChainId);
   const metaMetricsId = useSelector(getMetaMetricsId);
 
   const getBuyURI = useCallback(
     (_chainId: Hex) => {
-      // ChainId is not used in the current implementation but is kept for future use
       const params = new URLSearchParams();
-      params.set('metamaskEntry', 'ext_buy_sell_button');
+      params.set('metamaskEntry', metamaskEntry);
+      params.set('chainId', _chainId);
       if (metaMetricsId) {
         params.set('metametricsId', metaMetricsId);
       }
diff --git a/ui/hooks/snaps/useTransactionInsightSnaps.js b/ui/hooks/snaps/useTransactionInsightSnaps.js
index 9b4414837287..6e78a5f2b9e5 100644
--- a/ui/hooks/snaps/useTransactionInsightSnaps.js
+++ b/ui/hooks/snaps/useTransactionInsightSnaps.js
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { getTransactionOriginCaveat } from '@metamask/snaps-rpc-methods';
+import { SeverityLevel } from '@metamask/snaps-sdk';
 import { handleSnapRequest } from '../../store/actions';
 import { getPermissionSubjectsDeepEqual } from '../../selectors';
 
@@ -11,38 +12,26 @@ export function useTransactionInsightSnaps({
   chainId,
   origin,
   insightSnaps,
-  eagerFetching = true,
-  insightSnapId = '',
 }) {
   const subjects = useSelector(getPermissionSubjectsDeepEqual);
 
   const [loading, setLoading] = useState(true);
   const [data, setData] = useState(undefined);
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-  const [hasFetchedV2Insight, setHasFetchedV2Insight] = useState(false);
-  ///: END:ONLY_INCLUDE_IF
+  const [hasFetchedInsight, setHasFetchedInsight] = useState(false);
+
   useEffect(() => {
     let cancelled = false;
 
     async function fetchInsight() {
-      ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-      if (hasFetchedV2Insight) {
-        setLoading(false);
-        return;
-      }
-      ///: END:ONLY_INCLUDE_IF
-
-      if (!eagerFetching) {
+      if (hasFetchedInsight) {
         setLoading(false);
         return;
       }
 
       setLoading(true);
 
-      const snapIds = insightSnapId.length > 0 ? [insightSnapId] : insightSnaps;
-
       const newData = await Promise.allSettled(
-        snapIds.map((snapId) => {
+        insightSnaps.map((snapId) => {
           const permission = subjects[snapId]?.permissions[INSIGHT_PERMISSION];
           if (!permission) {
             return Promise.reject(
@@ -69,7 +58,7 @@ export function useTransactionInsightSnaps({
       );
 
       const reformattedData = newData.map((promise, idx) => {
-        const snapId = snapIds[idx];
+        const snapId = insightSnaps[idx];
         if (promise.status === 'rejected') {
           return {
             error: promise.reason,
@@ -85,9 +74,7 @@ export function useTransactionInsightSnaps({
       if (!cancelled) {
         setData(reformattedData);
         setLoading(false);
-        ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-        setHasFetchedV2Insight(true);
-        ///: END:ONLY_INCLUDE_IF
+        setHasFetchedInsight(true);
       }
     }
     if (transaction && Object.keys(transaction).length > 0) {
@@ -98,17 +85,24 @@ export function useTransactionInsightSnaps({
     };
   }, [
     transaction,
-    eagerFetching,
     chainId,
     origin,
     subjects,
     // TODO: Figure out how to improve this
     JSON.stringify(insightSnaps),
-    insightSnapId,
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-    hasFetchedV2Insight,
-    ///: END:ONLY_INCLUDE_IF
+    hasFetchedInsight,
   ]);
 
-  return { data, loading };
+  const warnings = data?.reduce((warningsArr, promise) => {
+    if (promise.response?.severity === SeverityLevel.Critical) {
+      const {
+        snapId,
+        response: { id },
+      } = promise;
+      warningsArr.push({ snapId, id });
+    }
+    return warningsArr;
+  }, []);
+
+  return { data, loading, warnings };
 }
diff --git a/ui/hooks/useAlerts.test.ts b/ui/hooks/useAlerts.test.ts
new file mode 100644
index 000000000000..70021c8a2a73
--- /dev/null
+++ b/ui/hooks/useAlerts.test.ts
@@ -0,0 +1,103 @@
+import { Severity } from '../helpers/constants/design-system';
+import { renderHookWithProvider } from '../../test/lib/render-helpers';
+import { ConfirmAlertsState } from '../ducks/confirm-alerts/confirm-alerts';
+import useAlerts from './useAlerts';
+
+describe('useAlerts', () => {
+  const ownerIdMock = '123';
+  const ownerId2Mock = '321';
+  const fromAlertKeyMock = 'from';
+  const dataAlertKeyMock = 'data';
+  const alertsMock = [
+    {
+      key: fromAlertKeyMock,
+      field: fromAlertKeyMock,
+      severity: Severity.Danger,
+      message: 'Alert 1',
+    },
+    { key: dataAlertKeyMock, severity: Severity.Warning, message: 'Alert 2' },
+  ];
+
+  const mockState = {
+    confirmAlerts: {
+      alerts: { [ownerIdMock]: alertsMock, [ownerId2Mock]: [alertsMock[0]] },
+      confirmed: {
+        [ownerIdMock]: { [fromAlertKeyMock]: true, [dataAlertKeyMock]: false },
+        [ownerId2Mock]: { [fromAlertKeyMock]: false },
+      },
+    },
+  };
+
+  const renderHookUseAlert = (ownerId?: string, state?: ConfirmAlertsState) => {
+    return renderHookWithProvider(
+      () => useAlerts(ownerId ?? ownerIdMock),
+      state ?? mockState,
+    );
+  };
+
+  const { result } = renderHookUseAlert();
+
+  describe('alerts', () => {
+    it('returns all alerts', () => {
+      expect(result.current.alerts).toEqual(alertsMock);
+    });
+  });
+
+  describe('generalAlerts', () => {
+    it('returns general alerts', () => {
+      const expectedGeneralAlerts = alertsMock.find(
+        (alert) => alert.key === dataAlertKeyMock,
+      );
+      expect(result.current.generalAlerts).toEqual([expectedGeneralAlerts]);
+    });
+  });
+
+  describe('getFieldAlerts', () => {
+    const expectedFieldAlerts = alertsMock.find(
+      (alert) => alert.field === fromAlertKeyMock,
+    );
+    it('returns all alert filtered by field property', () => {
+      expect(result.current.getFieldAlerts(fromAlertKeyMock)).toEqual([
+        expectedFieldAlerts,
+      ]);
+    });
+
+    it('returns empty array if field is not provided', () => {
+      expect(result.current.getFieldAlerts()).toEqual([]);
+    });
+
+    it('returns empty array, when no alert for specified field', () => {
+      expect(result.current.getFieldAlerts('mockedField')).toEqual([]);
+    });
+  });
+
+  describe('isAlertConfirmed', () => {
+    it('returns an if an alert is confirmed', () => {
+      expect(result.current.isAlertConfirmed(fromAlertKeyMock)).toBe(true);
+    });
+
+    it('returns an if an alert is not confirmed', () => {
+      const { result: resultAlerts } = renderHookUseAlert(ownerId2Mock);
+      expect(resultAlerts.current.isAlertConfirmed(fromAlertKeyMock)).toBe(
+        false,
+      );
+    });
+  });
+
+  describe('setAlertConfirmed', () => {
+    it('dismisses alert confirmation', () => {
+      const { result: resultAlerts } = renderHookUseAlert();
+      resultAlerts.current.setAlertConfirmed(fromAlertKeyMock, false);
+      expect(resultAlerts.current.isAlertConfirmed(fromAlertKeyMock)).toBe(
+        false,
+      );
+    });
+    it('confirms an alert', () => {
+      const { result: resultAlerts } = renderHookUseAlert(ownerId2Mock);
+      resultAlerts.current.setAlertConfirmed(fromAlertKeyMock, true);
+      expect(resultAlerts.current.isAlertConfirmed(fromAlertKeyMock)).toBe(
+        true,
+      );
+    });
+  });
+});
diff --git a/ui/hooks/useAlerts.ts b/ui/hooks/useAlerts.ts
new file mode 100644
index 000000000000..55853311d529
--- /dev/null
+++ b/ui/hooks/useAlerts.ts
@@ -0,0 +1,63 @@
+import { useDispatch, useSelector } from 'react-redux';
+import { useCallback } from 'react';
+import {
+  AlertsState,
+  selectAlerts,
+  selectConfirmedAlertKeys,
+  selectGeneralAlerts,
+} from '../selectors/alerts';
+import {
+  Alert,
+  setAlertConfirmed as setAlertConfirmedAction,
+} from '../ducks/confirm-alerts/confirm-alerts';
+
+const useAlerts = (ownerId: string) => {
+  const dispatch = useDispatch();
+
+  const alerts: Alert[] = useSelector((state) =>
+    selectAlerts(state as AlertsState, ownerId),
+  );
+
+  const confirmedAlertKeys = useSelector((state) =>
+    selectConfirmedAlertKeys(state as AlertsState, ownerId),
+  );
+
+  const generalAlerts = useSelector((state) =>
+    selectGeneralAlerts(state as AlertsState, ownerId),
+  );
+
+  const getFieldAlerts = useCallback(
+    (field: string | undefined) => {
+      if (!field) {
+        return [];
+      }
+
+      return alerts.filter((alert) => alert.field === field);
+    },
+    [alerts],
+  );
+
+  const setAlertConfirmed = useCallback(
+    (alertKey: string, isConfirmed: boolean) => {
+      dispatch(setAlertConfirmedAction(ownerId, alertKey, isConfirmed));
+    },
+    [dispatch, setAlertConfirmedAction, ownerId],
+  );
+
+  const isAlertConfirmed = useCallback(
+    (alertKey: string) => {
+      return confirmedAlertKeys.includes(alertKey);
+    },
+    [confirmedAlertKeys],
+  );
+
+  return {
+    alerts,
+    generalAlerts,
+    getFieldAlerts,
+    setAlertConfirmed,
+    isAlertConfirmed,
+  };
+};
+
+export default useAlerts;
diff --git a/ui/hooks/useCurrencyDisplay.js b/ui/hooks/useCurrencyDisplay.js
index e6eded343fe6..192aebf37906 100644
--- a/ui/hooks/useCurrencyDisplay.js
+++ b/ui/hooks/useCurrencyDisplay.js
@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
+import BigNumber from 'bignumber.js';
 import { formatCurrency } from '../helpers/utils/confirm-tx.util';
 import { getCurrentCurrency } from '../selectors';
 import {
@@ -12,9 +13,16 @@ import { TEST_NETWORK_TICKER_MAP } from '../../shared/constants/network';
 import { Numeric } from '../../shared/modules/Numeric';
 import { EtherDenomination } from '../../shared/constants/common';
 
-export const MIN_DISPLAY_AMOUNT = '<0.000001';
+// The smallest non-zero amount that can be displayed.
+export const MIN_AMOUNT = 0.000001;
 
-export const DEFAULT_PRECISION_DECIMALS = 6;
+// The string to display when 0 < amount < MIN_AMOUNT.
+// TODO(dbrans): Localize this string using Intl.NumberFormatter.
+const MIN_AMOUNT_DISPLAY = `<${MIN_AMOUNT}`;
+
+// The default precision for displaying currency values.
+// It set to the number of decimal places in the minimum amount.
+export const DEFAULT_PRECISION = new BigNumber(MIN_AMOUNT).decimalPlaces();
 
 /**
  * Defines the shape of the options parameter for useCurrencyDisplay
@@ -66,12 +74,12 @@ export function useCurrencyDisplay(
     ) {
       const ethDisplayValue = new Numeric(inputValue, 16, EtherDenomination.WEI)
         .toDenomination(denomination || EtherDenomination.ETH)
-        .round(numberOfDecimals || DEFAULT_PRECISION_DECIMALS)
+        .round(numberOfDecimals || DEFAULT_PRECISION)
         .toBase(10)
         .toString();
 
       return ethDisplayValue === '0' && inputValue && Number(inputValue) !== 0
-        ? MIN_DISPLAY_AMOUNT
+        ? MIN_AMOUNT_DISPLAY
         : ethDisplayValue;
     } else if (isUserPreferredCurrency && conversionRate) {
       return formatCurrency(
diff --git a/ui/hooks/useCurrencyRatePolling.ts b/ui/hooks/useCurrencyRatePolling.ts
new file mode 100644
index 000000000000..fb14b1c94797
--- /dev/null
+++ b/ui/hooks/useCurrencyRatePolling.ts
@@ -0,0 +1,26 @@
+import { useSelector } from 'react-redux';
+import {
+  getSelectedNetworkClientId,
+  getUseCurrencyRateCheck,
+} from '../selectors';
+import {
+  currencyRateStartPollingByNetworkClientId,
+  currencyRateStopPollingByPollingToken,
+} from '../store/actions';
+import { getCompletedOnboarding } from '../ducks/metamask/metamask';
+import usePolling from './usePolling';
+
+const useCurrencyRatePolling = (networkClientId?: string) => {
+  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
+  const completedOnboarding = useSelector(getCompletedOnboarding);
+  const selectedNetworkClientId = useSelector(getSelectedNetworkClientId);
+
+  usePolling({
+    startPollingByNetworkClientId: currencyRateStartPollingByNetworkClientId,
+    stopPollingByPollingToken: currencyRateStopPollingByPollingToken,
+    networkClientId: networkClientId ?? selectedNetworkClientId,
+    enabled: useCurrencyRateCheck && completedOnboarding,
+  });
+};
+
+export default useCurrencyRatePolling;
diff --git a/ui/hooks/useDisplayName.test.ts b/ui/hooks/useDisplayName.test.ts
index 268df3bbd28d..771cb9773144 100644
--- a/ui/hooks/useDisplayName.test.ts
+++ b/ui/hooks/useDisplayName.test.ts
@@ -7,6 +7,8 @@ import { useNames } from './useName';
 import { useFirstPartyContractNames } from './useFirstPartyContractName';
 
 jest.mock('react-redux', () => ({
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   useSelector: (selector: any) => selector(),
 }));
 
diff --git a/ui/hooks/useDisplayName.ts b/ui/hooks/useDisplayName.ts
index f8a9fcccfc0c..96e1f48c84e9 100644
--- a/ui/hooks/useDisplayName.ts
+++ b/ui/hooks/useDisplayName.ts
@@ -30,6 +30,8 @@ export function useDisplayNames(
   const values = requests.map(({ value }) => value);
 
   const contractInfo = useSelector((state) =>
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (getMemoizedMetadataContracts as any)(state, values, true),
   );
 
diff --git a/ui/hooks/useFirstPartyContractName.test.ts b/ui/hooks/useFirstPartyContractName.test.ts
index 05979755f06a..14d0cd429e6f 100644
--- a/ui/hooks/useFirstPartyContractName.test.ts
+++ b/ui/hooks/useFirstPartyContractName.test.ts
@@ -4,6 +4,8 @@ import { CHAIN_IDS } from '../../shared/constants/network';
 import { useFirstPartyContractName } from './useFirstPartyContractName';
 
 jest.mock('react-redux', () => ({
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   useSelector: (selector: any) => selector(),
 }));
 
diff --git a/ui/hooks/useIsOriginalNativeTokenSymbol.js b/ui/hooks/useIsOriginalNativeTokenSymbol.js
index 5d6059d736ea..3f885d28c8eb 100644
--- a/ui/hooks/useIsOriginalNativeTokenSymbol.js
+++ b/ui/hooks/useIsOriginalNativeTokenSymbol.js
@@ -1,15 +1,34 @@
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import fetchWithCache from '../../shared/lib/fetch-with-cache';
-import { CHAIN_ID_TO_CURRENCY_SYMBOL_MAP } from '../../shared/constants/network';
+import {
+  CHAIN_ID_TO_CURRENCY_SYMBOL_MAP,
+  CHAIN_ID_TO_CURRENCY_SYMBOL_MAP_NETWORK_COLLISION,
+} from '../../shared/constants/network';
 import { DAY } from '../../shared/constants/time';
 import { useSafeChainsListValidationSelector } from '../selectors';
+import { getValidUrl } from '../../app/scripts/lib/util';
 
-export function useIsOriginalNativeTokenSymbol(chainId, ticker, type) {
+export function useIsOriginalNativeTokenSymbol(
+  chainId,
+  ticker,
+  type,
+  rpcUrl = null,
+) {
   const [isOriginalNativeSymbol, setIsOriginalNativeSymbol] = useState(null);
   const useSafeChainsListValidation = useSelector(
     useSafeChainsListValidationSelector,
   );
+
+  const isLocalhost = (urlString) => {
+    const url = getValidUrl(urlString);
+
+    return (
+      url !== null &&
+      (url.hostname === 'localhost' || url.hostname === '127.0.0.1')
+    );
+  };
+
   useEffect(() => {
     async function getNativeTokenSymbol(networkId) {
       try {
@@ -18,12 +37,32 @@ export function useIsOriginalNativeTokenSymbol(chainId, ticker, type) {
           return;
         }
 
+        // exclude local dev network
+        if (isLocalhost(rpcUrl)) {
+          setIsOriginalNativeSymbol(true);
+          return;
+        }
+
         const mappedCurrencySymbol = CHAIN_ID_TO_CURRENCY_SYMBOL_MAP[chainId];
         if (mappedCurrencySymbol) {
           setIsOriginalNativeSymbol(mappedCurrencySymbol === ticker);
           return;
         }
 
+        const mappedAsNetworkCollision =
+          CHAIN_ID_TO_CURRENCY_SYMBOL_MAP_NETWORK_COLLISION[chainId];
+
+        const isMappedCollision =
+          mappedAsNetworkCollision &&
+          mappedAsNetworkCollision.some(
+            (network) => network.currencySymbol === ticker,
+          );
+
+        if (isMappedCollision) {
+          setIsOriginalNativeSymbol(true);
+          return;
+        }
+
         const safeChainsList = await fetchWithCache({
           url: 'https://chainid.network/chains.json',
           cacheOptions: { cacheRefreshTime: DAY },
@@ -48,6 +87,7 @@ export function useIsOriginalNativeTokenSymbol(chainId, ticker, type) {
     chainId,
     ticker,
     type,
+    rpcUrl,
     useSafeChainsListValidation,
   ]);
 
diff --git a/ui/hooks/useIsOriginalNativeTokenSymbol.test.js b/ui/hooks/useIsOriginalNativeTokenSymbol.test.js
index 1332eb295d1c..c28070e47077 100644
--- a/ui/hooks/useIsOriginalNativeTokenSymbol.test.js
+++ b/ui/hooks/useIsOriginalNativeTokenSymbol.test.js
@@ -196,4 +196,128 @@ describe('useNativeTokenFiatAmount', () => {
     expect(result.result.current).toBe(true);
     expect(spyFetch).not.toHaveBeenCalled();
   });
+
+  it('should return false if rpcUrl is localhost', async () => {
+    useSelector.mockImplementation(generateUseSelectorRouter(true));
+    // Mock the fetchWithCache function to throw an error
+    const spyFetch = jest
+      .spyOn(fetchWithCacheModule, 'default')
+      .mockImplementation(() => {
+        throw new Error('error');
+      });
+
+    let result;
+
+    await act(async () => {
+      result = renderHook(() =>
+        useIsOriginalNativeTokenSymbol(
+          '0x13a',
+          'FIL',
+          'mainnet',
+          'http://localhost:8545',
+        ),
+      );
+    });
+
+    // Expect the hook to return false when the native symbol does not match the ticker
+    expect(result.result.current).toBe(true);
+    expect(spyFetch).not.toHaveBeenCalled();
+  });
+
+  it('should not return false for collision network', async () => {
+    useSelector.mockImplementation(generateUseSelectorRouter(true));
+    // Mock the fetchWithCache function to throw an error
+    const spyFetch = jest
+      .spyOn(fetchWithCacheModule, 'default')
+      .mockImplementation(() => {
+        throw new Error('error');
+      });
+
+    let result;
+
+    await act(async () => {
+      result = renderHook(() =>
+        useIsOriginalNativeTokenSymbol(
+          '0x4e',
+          'ZYN',
+          'mainnet',
+          'https://rpc.wethio.io',
+        ),
+      );
+    });
+
+    // Expect the hook to return false when the native symbol does not match the ticker
+    expect(result.result.current).toBe(true);
+    expect(spyFetch).not.toHaveBeenCalled();
+  });
+
+  it('should return false for collision network with wrong symbol', async () => {
+    useSelector.mockImplementation(generateUseSelectorRouter(true));
+    // Mock the safeChainsList response
+    const safeChainsList = [
+      {
+        chainId: 78,
+        nativeCurrency: {
+          symbol: 'PETH',
+        },
+      },
+    ];
+
+    // Mock the fetchWithCache function to return the safeChainsList
+    const spyFetch = jest
+      .spyOn(fetchWithCacheModule, 'default')
+      .mockResolvedValue(safeChainsList);
+
+    let result;
+
+    await act(async () => {
+      result = renderHook(() =>
+        useIsOriginalNativeTokenSymbol(
+          '0x4e',
+          'TEST',
+          'mainnet',
+          'https://rpc.wethio.io',
+        ),
+      );
+    });
+
+    // Expect the hook to return false when the native symbol does not match the ticker
+    expect(result.result.current).toBe(false);
+    expect(spyFetch).toHaveBeenCalled();
+  });
+
+  it('should return true for collision network with correct symbol', async () => {
+    useSelector.mockImplementation(generateUseSelectorRouter(true));
+    // Mock the safeChainsList response
+    const safeChainsList = [
+      {
+        chainId: 78,
+        nativeCurrency: {
+          symbol: 'PETH',
+        },
+      },
+    ];
+
+    // Mock the fetchWithCache function to return the safeChainsList
+    const spyFetch = jest
+      .spyOn(fetchWithCacheModule, 'default')
+      .mockResolvedValue(safeChainsList);
+
+    let result;
+
+    await act(async () => {
+      result = renderHook(() =>
+        useIsOriginalNativeTokenSymbol(
+          '0x4e',
+          'PETH',
+          'mainnet',
+          'https://rpc.wethio.io',
+        ),
+      );
+    });
+
+    // Expect the hook to return false when the native symbol does not match the ticker
+    expect(result.result.current).toBe(true);
+    expect(spyFetch).toHaveBeenCalled();
+  });
 });
diff --git a/ui/hooks/useModalProps.test.ts b/ui/hooks/useModalProps.test.ts
index 4ba8ca2bd697..8b7fff1fb8c7 100644
--- a/ui/hooks/useModalProps.test.ts
+++ b/ui/hooks/useModalProps.test.ts
@@ -14,6 +14,8 @@ const MOCK_MM_STATE = {
 };
 
 jest.mock('react-redux', () => ({
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   useSelector: (selector: any) => selector(MOCK_MM_STATE),
   useDispatch: jest.fn(),
 }));
diff --git a/ui/hooks/useModalProps.ts b/ui/hooks/useModalProps.ts
index 6738e67ded3b..787e43577b9a 100644
--- a/ui/hooks/useModalProps.ts
+++ b/ui/hooks/useModalProps.ts
@@ -2,11 +2,15 @@ import { useSelector, useDispatch } from 'react-redux';
 import { hideModal } from '../store/actions';
 
 type ModalProps = {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   props: Record<string, any>;
   hideModal: () => void;
 };
 
 export function useModalProps(): ModalProps {
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const modalProps = useSelector((state: any) => {
     return state.appState.modal.modalState?.props;
   });
diff --git a/ui/hooks/useName.test.ts b/ui/hooks/useName.test.ts
index 18d30f697119..76bd5dc593ad 100644
--- a/ui/hooks/useName.test.ts
+++ b/ui/hooks/useName.test.ts
@@ -9,6 +9,8 @@ import { getCurrentChainId, getNames } from '../selectors';
 import { useName } from './useName';
 
 jest.mock('react-redux', () => ({
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   useSelector: (selector: any) => selector(),
 }));
 
@@ -35,6 +37,8 @@ const PROPOSED_NAMES_MOCK = {
 describe('useName', () => {
   const getCurrentChainIdMock = jest.mocked(getCurrentChainId);
   const getNamesMock =
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     jest.mocked<(state: any) => NameControllerState['names']>(getNames);
 
   beforeEach(() => {
diff --git a/ui/hooks/usePolling.ts b/ui/hooks/usePolling.ts
index ae64d3c73bb6..1a9d6b1f576e 100644
--- a/ui/hooks/usePolling.ts
+++ b/ui/hooks/usePolling.ts
@@ -4,11 +4,16 @@ type UsePollingOptions = {
   callback?: (pollingToken: string) => (pollingToken: string) => void;
   startPollingByNetworkClientId: (
     networkClientId: string,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     options: any,
   ) => Promise<string>;
   stopPollingByPollingToken: (pollingToken: string) => void;
   networkClientId: string;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   options?: any;
+  enabled?: boolean;
 };
 
 const usePolling = (usePollingOptions: UsePollingOptions) => {
@@ -16,6 +21,12 @@ const usePolling = (usePollingOptions: UsePollingOptions) => {
   const cleanupRef = useRef<null | ((pollingToken: string) => void)>(null);
   let isMounted = false;
   useEffect(() => {
+    if (usePollingOptions.enabled === false) {
+      return () => {
+        // noop
+      };
+    }
+
     isMounted = true;
 
     const cleanup = () => {
@@ -24,6 +35,7 @@ const usePolling = (usePollingOptions: UsePollingOptions) => {
         cleanupRef.current?.(pollTokenRef.current);
       }
     };
+
     // Start polling when the component mounts
     usePollingOptions
       .startPollingByNetworkClientId(
@@ -50,6 +62,7 @@ const usePolling = (usePollingOptions: UsePollingOptions) => {
         usePollingOptions.options,
         Object.keys(usePollingOptions.options).sort(),
       ),
+    usePollingOptions.enabled,
   ]);
 };
 
diff --git a/ui/hooks/usePrevious.js b/ui/hooks/usePrevious.ts
similarity index 56%
rename from ui/hooks/usePrevious.js
rename to ui/hooks/usePrevious.ts
index 8e44b945384d..691f4af69b4e 100644
--- a/ui/hooks/usePrevious.js
+++ b/ui/hooks/usePrevious.ts
@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react';
 
-export function usePrevious(value) {
-  const ref = useRef();
+export function usePrevious<T>(value: T): T | undefined {
+  const ref = useRef<T | undefined>();
   useEffect(() => {
     ref.current = value;
   }, [value]);
diff --git a/ui/hooks/useScrollRequired.js b/ui/hooks/useScrollRequired.js
index 686c57808913..196a91e3f3db 100644
--- a/ui/hooks/useScrollRequired.js
+++ b/ui/hooks/useScrollRequired.js
@@ -8,10 +8,16 @@ import { debounce } from 'lodash';
  * The hook expects both the `ref` and the `onScroll` handler to be passed to the scrolling element.
  *
  * @param dependencies - Any optional hook dependencies for updating the scroll state.
+ * @param opt
+ * @param {number} opt.offsetPxFromBottom
  * @returns Flags for isScrollable and isScrollToBottom, a ref to use for the scrolling content, a scrollToBottom function and a onScroll handler.
  */
-export const useScrollRequired = (dependencies = []) => {
+export const useScrollRequired = (
+  dependencies = [],
+  { offsetPxFromBottom = 16 } = {},
+) => {
   const ref = useRef(null);
+
   const [hasScrolledToBottomState, setHasScrolledToBottom] = useState(false);
   const [isScrollableState, setIsScrollable] = useState(false);
   const [isScrolledToBottomState, setIsScrolledToBottom] = useState(false);
@@ -20,7 +26,6 @@ export const useScrollRequired = (dependencies = []) => {
     if (!ref.current) {
       return;
     }
-
     const isScrollable =
       ref.current && ref.current.scrollHeight > ref.current.clientHeight;
 
@@ -28,7 +33,9 @@ export const useScrollRequired = (dependencies = []) => {
       isScrollable &&
       // Add 16px to the actual scroll position to trigger setIsScrolledToBottom sooner.
       // This avoids the problem where a user has scrolled down to the bottom and it's not detected.
-      Math.round(ref.current.scrollTop) + ref.current.offsetHeight + 16 >=
+      Math.round(ref.current.scrollTop) +
+        ref.current.offsetHeight +
+        offsetPxFromBottom >=
         ref.current.scrollHeight;
 
     setIsScrollable(isScrollable);
@@ -58,6 +65,7 @@ export const useScrollRequired = (dependencies = []) => {
     isScrolledToBottom: isScrolledToBottomState,
     hasScrolledToBottom: hasScrolledToBottomState,
     scrollToBottom,
+    setHasScrolledToBottom,
     ref,
     onScroll: debounce(update, 25),
   };
diff --git a/ui/hooks/useTheme.test.ts b/ui/hooks/useTheme.test.ts
index f079ce9863f8..8b0f2edd66ac 100644
--- a/ui/hooks/useTheme.test.ts
+++ b/ui/hooks/useTheme.test.ts
@@ -6,6 +6,8 @@ jest.mock('../selectors', () => ({
   getTheme: jest.fn(),
 }));
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const renderProviderWithTheme: any = (
   settingTheme = ThemeType.light,
   documentTheme = ThemeType.light,
diff --git a/ui/hooks/useTransactionInsights.js b/ui/hooks/useTransactionInsights.js
index 77653a6d15af..b6d1a851aec1 100644
--- a/ui/hooks/useTransactionInsights.js
+++ b/ui/hooks/useTransactionInsights.js
@@ -1,12 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import {
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-  useDispatch,
-  ///: END:ONLY_INCLUDE_IF
-  useSelector,
-} from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
-import { SeverityLevel } from '@metamask/snaps-sdk';
 import { TransactionType } from '@metamask/transaction-controller';
 import { stripHexPrefix } from '../../shared/modules/hexstring-utils';
 import { Tab } from '../components/ui/tabs';
@@ -17,9 +11,7 @@ import {
   getInsightSnaps,
   getSnapsMetadata,
 } from '../selectors';
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
 import { deleteInterface } from '../store/actions';
-///: END:ONLY_INCLUDE_IF
 import { getSnapName } from '../helpers/utils/util';
 import { useTransactionInsightSnaps } from './snaps/useTransactionInsightSnaps';
 
@@ -34,9 +26,7 @@ const isAllowedTransactionTypes = (transactionType) =>
 // https://github.com/MetaMask/metamask-extension/blob/develop/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js#L129
 // Thus it is not possible to use React Component here
 const useTransactionInsights = ({ txData }) => {
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   const dispatch = useDispatch();
-  ///: END:ONLY_INCLUDE_IF
   const { txParams, chainId, origin } = txData;
   const caip2ChainId = `eip155:${stripHexPrefix(chainId)}`;
   const insightSnaps = useSelector(getInsightSnaps);
@@ -54,17 +44,10 @@ const useTransactionInsights = ({ txData }) => {
     chainId: caip2ChainId,
     origin,
     insightSnaps: insightSnapIds,
-    ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-    insightSnapId: selectedInsightSnapId,
-    ///: END:ONLY_INCLUDE_IF
   };
 
-  const { data, loading } = useTransactionInsightSnaps({
-    ...insightHookParams,
-    ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-    eagerFetching: false,
-    ///: END:ONLY_INCLUDE_IF
-  });
+  const { data, loading, warnings } =
+    useTransactionInsightSnaps(insightHookParams);
 
   useEffect(() => {
     if (insightSnapIds.length > 0 && !selectedInsightSnapId) {
@@ -72,7 +55,6 @@ const useTransactionInsights = ({ txData }) => {
     }
   }, [insightSnapIds, selectedInsightSnapId, setSelectedInsightSnapId]);
 
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   useEffect(() => {
     return () => {
       data?.map(
@@ -81,7 +63,6 @@ const useTransactionInsights = ({ txData }) => {
       );
     };
   }, [data]);
-  ///: END:ONLY_INCLUDE_IF
 
   if (!isAllowedTransactionTypes(txData.type) || !insightSnaps.length) {
     return null;
@@ -103,13 +84,8 @@ const useTransactionInsights = ({ txData }) => {
       >
         <SnapInsight
           snapId={selectedInsightSnapId}
-          ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
           data={data?.[0]}
-          ///: END:ONLY_INCLUDE_IF
           loading={loading}
-          ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-          insightHookParams={insightHookParams}
-          ///: END:ONLY_INCLUDE_IF
         />
       </Tab>
     );
@@ -122,11 +98,9 @@ const useTransactionInsights = ({ txData }) => {
       };
     });
 
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
     const selectedSnapData = data?.find(
       (promise) => promise?.snapId === selectedInsightSnapId,
     );
-    ///: END:ONLY_INCLUDE_IF
 
     insightComponent = (
       <DropdownTab
@@ -138,28 +112,12 @@ const useTransactionInsights = ({ txData }) => {
         <SnapInsight
           snapId={selectedInsightSnapId}
           loading={loading}
-          ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
           data={selectedSnapData}
-          ///: END:ONLY_INCLUDE_IF
-          ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi,build-beta)
-          insightHookParams={insightHookParams}
-          ///: END:ONLY_INCLUDE_IF
         />
       </DropdownTab>
     );
   }
 
-  const warnings = data?.reduce((warningsArr, promise) => {
-    if (promise.response?.severity === SeverityLevel.Critical) {
-      const {
-        snapId,
-        response: { id },
-      } = promise;
-      warningsArr.push({ snapId, id });
-    }
-    return warningsArr;
-  }, []);
-
   return { insightComponent, warnings };
 };
 
diff --git a/ui/hooks/useUserPreferencedCurrency.js b/ui/hooks/useUserPreferencedCurrency.js
index 5905867f4adf..92b9f2e54e32 100644
--- a/ui/hooks/useUserPreferencedCurrency.js
+++ b/ui/hooks/useUserPreferencedCurrency.js
@@ -8,6 +8,7 @@ import { getNativeCurrency } from '../ducks/metamask/metamask';
 
 import { PRIMARY, SECONDARY } from '../helpers/constants/common';
 import { EtherDenomination } from '../../shared/constants/common';
+import { ETH_DEFAULT_DECIMALS } from '../constants';
 
 /**
  * Defines the shape of the options parameter for useUserPreferencedCurrency
@@ -55,7 +56,8 @@ export function useUserPreferencedCurrency(type, opts = {}) {
 
   const nativeReturn = {
     currency: nativeCurrency || EtherDenomination.ETH,
-    numberOfDecimals: opts.numberOfDecimals || opts.ethNumberOfDecimals || 8,
+    numberOfDecimals:
+      opts.numberOfDecimals || opts.ethNumberOfDecimals || ETH_DEFAULT_DECIMALS,
   };
 
   if (opts.showNativeOverride) {
diff --git a/ui/index.js b/ui/index.js
index 29458954d42c..da966a16019d 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -16,9 +16,13 @@ import { setupLocale } from '../shared/lib/error-utils';
 import * as actions from './store/actions';
 import configureStore from './store/store';
 import {
+  getOriginOfCurrentTab,
   getPermittedAccountsForCurrentTab,
   getSelectedInternalAccount,
   getUnapprovedTransactions,
+  getNetworkToAutomaticallySwitchTo,
+  getSwitchedNetworkDetails,
+  getUseRequestQueue,
 } from './selectors';
 import { ALERT_STATE } from './ducks/alerts';
 import {
@@ -190,6 +194,38 @@ async function startApp(metamaskState, backgroundConnection, opts) {
     },
   };
 
+  // This block autoswitches chains based on the last chain used
+  // for a given dapp, when there are no pending confimrations
+  // This allows the user to be connected on one chain
+  // for one dapp, and automatically change for another
+  const state = store.getState();
+  const networkIdToSwitchTo = getNetworkToAutomaticallySwitchTo(state);
+  if (networkIdToSwitchTo) {
+    await store.dispatch(
+      actions.automaticallySwitchNetwork(
+        networkIdToSwitchTo,
+        getOriginOfCurrentTab(state),
+      ),
+    );
+  } else if (getSwitchedNetworkDetails(state)) {
+    // It's possible that old details could exist if the user
+    // opened the toast but then didn't close it
+    // Clear out any existing switchedNetworkDetails
+    // if the user didn't just change the dapp network
+    await store.dispatch(actions.clearSwitchedNetworkDetails());
+  }
+
+  // Register this window as the current popup
+  // and set in background state
+  if (
+    getUseRequestQueue(state) &&
+    getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
+  ) {
+    const thisPopupId = Date.now();
+    global.metamask.id = thisPopupId;
+    await store.dispatch(actions.setCurrentExtensionPopupId(thisPopupId));
+  }
+
   // start app
   render(<Root store={store} />, opts.container);
 
diff --git a/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap b/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap
index 0f3f3df13c45..b740ec784d5c 100644
--- a/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap
+++ b/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap
@@ -69,6 +69,7 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = `
                 </div>
                 <div
                   class="network-account-balance-header__network-account__ident-icon-ethereum"
+                  style="height: 16px; width: 16px;"
                 >
                   <img
                     alt="Ethereum Mainnet"
@@ -124,6 +125,7 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = `
                 >
                   <div
                     class=""
+                    style="height: 24px; width: 24px;"
                   >
                     <span
                       class="icon-with-fallback__fallback"
@@ -279,6 +281,7 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = `
               </div>
               <div
                 class="network-account-balance-header__network-account__ident-icon-ethereum"
+                style="height: 16px; width: 16px;"
               >
                 <img
                   alt="Ethereum Mainnet"
@@ -334,6 +337,7 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = `
               >
                 <div
                   class=""
+                  style="height: 24px; width: 24px;"
                 >
                   <span
                     class="icon-with-fallback__fallback"
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.stories.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.stories.js
index 62dc8e5bc466..15eb1850fa26 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.stories.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.stories.js
@@ -6,15 +6,18 @@ import configureStore from '../../../../../store/store';
 import { AdvancedGasFeePopoverContextProvider } from '../context';
 import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
 import { GasEstimateTypes } from '../../../../../../shared/constants/gas';
+import { getSelectedInternalAccountFromMockState } from '../../../../../../test/jest/mocks';
 import AdvancedGasFeeDefaults from './advanced-gas-fee-defaults';
 
+const mockInternalAccount = getSelectedInternalAccountFromMockState(mockState);
+
 const store = configureStore({
   ...mockState,
   metamask: {
     ...mockState.metamask,
     accounts: {
-      [mockState.metamask.selectedAddress]: {
-        address: mockState.metamask.selectedAddress,
+      [mockInternalAccount.address]: {
+        address: mockInternalAccount.address,
         balance: '0x1F4',
       },
     },
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js
index 1b7c258a3705..3791a2d802cf 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js
@@ -16,6 +16,7 @@ import configureStore from '../../../../../store/store';
 
 import AdvancedGasFeeInputs from '../advanced-gas-fee-inputs';
 import { CHAIN_IDS } from '../../../../../../shared/constants/network';
+import { getSelectedInternalAccountFromMockState } from '../../../../../../test/jest/mocks';
 import AdvancedGasFeeDefaults from './advanced-gas-fee-defaults';
 
 const TEXT_SELECTOR = 'Save these values as my default for the Goerli network.';
@@ -33,14 +34,17 @@ jest.mock('../../../../../store/actions', () => ({
   createTransactionEventFragment: jest.fn(),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async (defaultGasParams, contextParams) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       ...defaultGasParams,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js
index bba6d4c5aba8..5445cb3d1d81 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js
@@ -10,6 +10,7 @@ import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
 import configureStore from '../../../../../store/store';
 
 import { AdvancedGasFeePopoverContextProvider } from '../context';
+import { getSelectedInternalAccountFromMockState } from '../../../../../../test/jest/mocks';
 import AdvancedGasFeeGasLimit from './advanced-gas-fee-gas-limit';
 
 jest.mock('../../../../../store/actions', () => ({
@@ -22,13 +23,16 @@ jest.mock('../../../../../store/actions', () => ({
     .mockResolvedValue({ chainId: '0x5' }),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async (contextProps) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
index fa0653251750..fe4232ffcb0e 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
@@ -76,10 +76,14 @@ const BaseFeeInput = () => {
       ? advancedGasFeeValues.maxBaseFee
       : maxFeePerGas;
 
-  const [baseFee, setBaseFee] = useState(defaultBaseFee);
+  const [baseFee, setBaseFee] = useState(
+    defaultBaseFee > 0 ? defaultBaseFee : undefined,
+  );
   useEffect(() => {
-    setBaseFee(defaultBaseFee);
-  }, [defaultBaseFee, setBaseFee]);
+    if (baseFee === undefined && defaultBaseFee > 0) {
+      setBaseFee(defaultBaseFee);
+    }
+  }, [baseFee, defaultBaseFee, setBaseFee]);
 
   const [baseFeeInPrimaryCurrency] = useCurrencyDisplay(
     decGWEIToHexWEI(baseFee * gasLimit),
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js
index c3413ddc0a0b..18c244d31885 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js
@@ -13,6 +13,7 @@ import configureStore from '../../../../../../store/store';
 
 import { AdvancedGasFeePopoverContextProvider } from '../../context';
 import AdvancedGasFeeGasLimit from '../../advanced-gas-fee-gas-limit';
+import { getSelectedInternalAccountFromMockState } from '../../../../../../../test/jest/mocks';
 import BaseFeeInput from './base-fee-input';
 
 const LOW_BASE_FEE = 0.000000001;
@@ -27,13 +28,16 @@ jest.mock('../../../../../../store/actions', () => ({
     .mockResolvedValue({ chainId: '0x5' }),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async (txProps, contextProps) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
index 6079955196f3..257a5c9bb50d 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
@@ -76,10 +76,14 @@ const PriorityFeeInput = () => {
       ? advancedGasFeeValues.priorityFee
       : maxPriorityFeePerGas;
 
-  const [priorityFee, setPriorityFee] = useState(defaultPriorityFee);
+  const [priorityFee, setPriorityFee] = useState(
+    defaultPriorityFee > 0 ? defaultPriorityFee : undefined,
+  );
   useEffect(() => {
-    setPriorityFee(defaultPriorityFee);
-  }, [defaultPriorityFee, setPriorityFee]);
+    if (priorityFee === undefined && defaultPriorityFee > 0) {
+      setPriorityFee(defaultPriorityFee);
+    }
+  }, [priorityFee, defaultPriorityFee, setPriorityFee]);
 
   const { currency, numberOfDecimals } = useUserPreferencedCurrency(PRIMARY);
 
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js
index 1378e89c84b3..94dd3edf5609 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js
@@ -14,6 +14,7 @@ import configureStore from '../../../../../../store/store';
 import { AdvancedGasFeePopoverContextProvider } from '../../context';
 import AdvancedGasFeeGasLimit from '../../advanced-gas-fee-gas-limit';
 import { CHAIN_IDS } from '../../../../../../../shared/constants/network';
+import { getSelectedInternalAccountFromMockState } from '../../../../../../../test/jest/mocks';
 import PriorityfeeInput from './priority-fee-input';
 
 const LOW_PRIORITY_FEE = 0.000000001;
@@ -28,13 +29,16 @@ jest.mock('../../../../../../store/actions', () => ({
     .mockResolvedValue({ chainId: '0x5' }),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async (txProps, contextProps) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js
index 488b044513c3..fa6d82c227f1 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js
@@ -9,6 +9,7 @@ import { MAX_GAS_LIMIT_DEC } from '../../send/send.constants';
 import { GasFeeContextProvider } from '../../../../contexts/gasFee';
 import configureStore from '../../../../store/store';
 
+import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
 import AdvancedGasFeePopover from './advanced-gas-fee-popover';
 
 jest.mock('../../../../store/actions', () => ({
@@ -29,13 +30,16 @@ jest.mock('../../../../contexts/transaction-modal', () => ({
   }),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async () => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/components/approve-content-card/approve-content-card.stories.js b/ui/pages/confirmations/components/approve-content-card/approve-content-card.stories.js
index a2b85806f29d..0555c48425a4 100644
--- a/ui/pages/confirmations/components/approve-content-card/approve-content-card.stories.js
+++ b/ui/pages/confirmations/components/approve-content-card/approve-content-card.stories.js
@@ -36,7 +36,7 @@ export default {
     renderDataContent: {
       control: 'boolean',
     },
-    isMultiLayerFeeNetwork: {
+    hasLayer1GasFee: {
       control: 'boolean',
     },
     ethTransactionTotal: {
@@ -80,7 +80,7 @@ export default {
     supportsEIP1559: false,
     renderTransactionDetailsContent: true,
     renderDataContent: false,
-    isMultiLayerFeeNetwork: false,
+    hasLayer1GasFee: false,
     ethTransactionTotal: '0.0012',
     nativeCurrency: 'GoerliETH',
     hexTransactionTotal: '0x44364c5bb0000',
diff --git a/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/__snapshots__/blockaid-unavailable-banner-alert.test.tsx.snap b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/__snapshots__/blockaid-unavailable-banner-alert.test.tsx.snap
new file mode 100644
index 000000000000..780135bc2132
--- /dev/null
+++ b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/__snapshots__/blockaid-unavailable-banner-alert.test.tsx.snap
@@ -0,0 +1,50 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<BlockaidUnavailableBannerAlert /> should not render if user hasn't been migrated to blockaid 1`] = `<div />`;
+
+exports[`<BlockaidUnavailableBannerAlert /> should render if user has been migrated to blockaid 1`] = `
+<div>
+  <div
+    class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-info mm-box--margin-4 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-primary-muted mm-box--rounded-sm"
+  >
+    <span
+      class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-primary-default"
+      style="mask-image: url('./images/icons/info.svg');"
+    />
+    <div
+      class="mm-box mm-box--min-width-0"
+    >
+      <p
+        class="mm-box mm-text mm-text--body-lg-medium mm-box--color-text-default"
+      >
+        Heads up!
+      </p>
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+      >
+        Security alerts are no longer available on this network. Installing a Snap may improve your security.
+      </p>
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+      />
+      <a
+        class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+        href="https://snaps.metamask.io/transaction-insights"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Explore Snaps
+      </a>
+    </div>
+    <button
+      aria-label="Close"
+      class="mm-box mm-button-icon mm-button-icon--size-sm mm-banner-base__close-button mm-box--margin-left-auto mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+    >
+      <span
+        class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+        style="mask-image: url('./images/icons/close.svg');"
+      />
+    </button>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.stories.tsx b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.stories.tsx
new file mode 100644
index 000000000000..bbb1752a9da3
--- /dev/null
+++ b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.stories.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { BlockaidUnavailableBannerAlert } from './blockaid-unavailable-banner-alert';
+
+export default {
+  title: 'Components/App/Confirm/BlockaidUnavailableBannerAlert',
+};
+
+export const DefaultStory = () => <BlockaidUnavailableBannerAlert />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.test.tsx b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.test.tsx
new file mode 100644
index 000000000000..dffe59df0211
--- /dev/null
+++ b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.test.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+import mockState from '../../../../../test/data/mock-state.json';
+import configureStore from '../../../../store/store';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers';
+import { BlockaidUnavailableBannerAlert } from './blockaid-unavailable-banner-alert';
+
+describe('<BlockaidUnavailableBannerAlert />', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const render = (storeOverrides: Record<string, any> = {}) => {
+    const store = configureStore({
+      ...mockState.metamask,
+      metamask: { ...mockState.metamask },
+      ...storeOverrides,
+    });
+
+    return renderWithProvider(<BlockaidUnavailableBannerAlert />, store);
+  };
+
+  it("should not render if user hasn't been migrated to blockaid", () => {
+    const { container } = render();
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render if user has been migrated to blockaid', () => {
+    const { container } = render({
+      metamask: {
+        hasMigratedFromOpenSeaToBlockaid: true,
+      },
+    });
+
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.tsx b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.tsx
new file mode 100644
index 000000000000..e7d5b254b477
--- /dev/null
+++ b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  BannerAlert,
+  BannerAlertSeverity,
+} from '../../../../components/component-library';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import {
+  getHasDismissedOpenSeaToBlockaidBanner,
+  getHasMigratedFromOpenSeaToBlockaid,
+  getIsNetworkSupportedByBlockaid,
+} from '../../../../selectors';
+import { dismissOpenSeaToBlockaidBanner } from '../../../../store/actions';
+
+export const BlockaidUnavailableBannerAlert = () => {
+  const dispatch = useDispatch();
+  const t = useI18nContext();
+
+  const hasMigratedFromOpenSeaToBlockaid = useSelector(
+    getHasMigratedFromOpenSeaToBlockaid,
+  );
+  const isNetworkSupportedByBlockaid = useSelector(
+    getIsNetworkSupportedByBlockaid,
+  );
+  const hasDismissedOpenSeaToBlockaidBanner = useSelector(
+    getHasDismissedOpenSeaToBlockaidBanner,
+  );
+
+  const showOpenSeaToBlockaidBannerAlert =
+    hasMigratedFromOpenSeaToBlockaid &&
+    !isNetworkSupportedByBlockaid &&
+    !hasDismissedOpenSeaToBlockaidBanner;
+
+  const handleCloseOpenSeaToBlockaidBannerAlert = () => {
+    dispatch(dismissOpenSeaToBlockaidBanner());
+  };
+
+  return showOpenSeaToBlockaidBannerAlert ? (
+    <BannerAlert
+      severity={BannerAlertSeverity.Info}
+      title={t('openSeaToBlockaidTitle')}
+      description={t('openSeaToBlockaidDescription')}
+      actionButtonLabel={t('openSeaToBlockaidBtnLabel')}
+      actionButtonProps={{
+        href: 'https://snaps.metamask.io/transaction-insights',
+        externalLink: true,
+      }}
+      margin={4}
+      onClose={handleCloseOpenSeaToBlockaidBannerAlert}
+    />
+  ) : null;
+};
diff --git a/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/index.ts b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/index.ts
new file mode 100644
index 000000000000..c8ceb0873461
--- /dev/null
+++ b/ui/pages/confirmations/components/blockaid-unavailable-banner-alert/index.ts
@@ -0,0 +1 @@
+export { BlockaidUnavailableBannerAlert } from './blockaid-unavailable-banner-alert';
diff --git a/ui/pages/confirmations/components/confirm-gas-display/confirm-gas-display.test.js b/ui/pages/confirmations/components/confirm-gas-display/confirm-gas-display.test.js
index 4cb9c499c01b..ac8687c91e74 100644
--- a/ui/pages/confirmations/components/confirm-gas-display/confirm-gas-display.test.js
+++ b/ui/pages/confirmations/components/confirm-gas-display/confirm-gas-display.test.js
@@ -10,6 +10,7 @@ import { renderWithProvider } from '../../../../../test/jest';
 import configureStore from '../../../../store/store';
 
 import { GasFeeContextProvider } from '../../../../contexts/gasFee';
+import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
 import ConfirmGasDisplay from './confirm-gas-display';
 
 jest.mock('../../../../store/actions', () => ({
@@ -23,6 +24,9 @@ jest.mock('../../../../store/actions', () => ({
   getGasFeeTimeEstimate: jest.fn().mockImplementation(() => Promise.resolve()),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async ({ transactionProp = {}, contextProps = {} } = {}) => {
   const store = configureStore({
     ...mockState,
@@ -30,8 +34,8 @@ const render = async ({ transactionProp = {}, contextProps = {} } = {}) => {
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js b/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
index db5cfa9651f5..7bd1ccfb0403 100644
--- a/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
+++ b/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
@@ -5,7 +5,6 @@ import { useSelector } from 'react-redux';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import {
   getIsMainnet,
-  getIsMultiLayerFeeNetwork,
   getPreferences,
   getUnapprovedTransactions,
   getUseCurrencyRateCheck,
@@ -24,8 +23,6 @@ import {
   TextColor,
 } from '../../../../../helpers/constants/design-system';
 import { useDraftTransactionWithTxParams } from '../../../hooks/useDraftTransactionWithTxParams';
-import { getNativeCurrency } from '../../../../../ducks/metamask/metamask';
-import MultilayerFeeMessage from '../../multilayer-fee-message/multi-layer-fee-message';
 import {
   Icon,
   IconName,
@@ -40,10 +37,8 @@ const ConfirmLegacyGasDisplay = ({ 'data-testid': dataTestId } = {}) => {
 
   // state selectors
   const isMainnet = useSelector(getIsMainnet);
-  const isMultiLayerFeeNetwork = useSelector(getIsMultiLayerFeeNetwork);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
-  const nativeCurrency = useSelector(getNativeCurrency);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
   const transactionData = useDraftTransactionWithTxParams();
   const txData = useSelector((state) => txDataSelector(state));
@@ -55,41 +50,6 @@ const ConfirmLegacyGasDisplay = ({ 'data-testid': dataTestId } = {}) => {
     (state) => transactionFeeSelector(state, transaction),
   );
 
-  if (isMultiLayerFeeNetwork) {
-    return [
-      <TransactionDetailItem
-        key="legacy-total-item"
-        data-testid={dataTestId}
-        detailTitle={t('transactionDetailLayer2GasHeading')}
-        detailTotal={
-          <UserPreferencedCurrencyDisplay
-            type={PRIMARY}
-            value={hexMinimumTransactionFee}
-            hideLabel={!useNativeCurrencyAsPrimaryCurrency}
-            numberOfDecimals={18}
-          />
-        }
-        detailText={
-          useCurrencyRateCheck && (
-            <UserPreferencedCurrencyDisplay
-              type={SECONDARY}
-              value={hexMinimumTransactionFee}
-              hideLabel={Boolean(useNativeCurrencyAsPrimaryCurrency)}
-            />
-          )
-        }
-        noBold
-        flexWidthValues
-      />,
-      <MultilayerFeeMessage
-        key="confirm-layer-1"
-        transaction={txData}
-        layer2fee={hexMinimumTransactionFee}
-        nativeCurrency={nativeCurrency}
-      />,
-    ];
-  }
-
   return (
     <TransactionDetailItem
       key="legacy-gas-details"
diff --git a/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.test.js b/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.test.js
index d419fa2ce258..6ce48a5acfc2 100644
--- a/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.test.js
+++ b/ui/pages/confirmations/components/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.test.js
@@ -2,19 +2,22 @@ import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 
 import mockState from '../../../../../../test/data/mock-state.json';
-import { CHAIN_IDS } from '../../../../../../shared/constants/network';
 import { renderWithProvider } from '../../../../../../test/jest';
 import configureStore from '../../../../../store/store';
 
+import { getSelectedInternalAccountFromMockState } from '../../../../../../test/jest/mocks';
 import ConfirmLegacyGasDisplay from './confirm-legacy-gas-display';
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const mmState = {
   ...mockState,
   metamask: {
     ...mockState.metamask,
     accounts: {
-      [mockState.metamask.selectedAddress]: {
-        address: mockState.metamask.selectedAddress,
+      [mockSelectedInternalAccount.address]: {
+        address: mockSelectedInternalAccount.address,
         balance: '0x1F4',
       },
     },
@@ -48,8 +51,8 @@ mmState.metamask.transactions[0].txParams = {
   type: '0x0',
 };
 
-const render = ({ contextProps, state = mmState } = {}) => {
-  const store = configureStore({ ...state, ...contextProps });
+const render = (state = mmState) => {
+  const store = configureStore(state);
 
   return renderWithProvider(<ConfirmLegacyGasDisplay />, store);
 };
@@ -81,6 +84,7 @@ describe('ConfirmLegacyGasDisplay', () => {
 
   it('should render label and gas details with draftTransaction', async () => {
     render({
+      ...mmState,
       send: {
         currentTransactionUUID: '1d40b578-6184-4607-8513-762c24d0a19b',
         draftTransactions: {
@@ -94,6 +98,7 @@ describe('ConfirmLegacyGasDisplay', () => {
               maxPriorityFeePerGas: '0x0',
               wasManuallyEdited: false,
             },
+            transactionType: '0x0',
           },
         },
       },
@@ -106,47 +111,21 @@ describe('ConfirmLegacyGasDisplay', () => {
     });
   });
 
-  it('should contain L1 L2 fee details for optimism', async () => {
-    mmState.metamask.providerConfig.chainId = CHAIN_IDS.OPTIMISM;
-    mmState.confirmTransaction.txData.chainId = CHAIN_IDS.OPTIMISM;
-    const state = {
-      metamask: {
-        ...mmState.metamask,
-        providerConfig: {
-          ...mmState.metamask.providerConfig,
-          chainId: CHAIN_IDS.OPTIMISM,
-        },
-      },
+  it('should display Estimated gas fee for L2 networks', async () => {
+    render({
+      ...mmState,
       confirmTransaction: {
         ...mmState.confirmTransaction,
         txData: {
           ...mmState.confirmTransaction.txData,
-          chainId: CHAIN_IDS.OPTIMISM,
-        },
-      },
-    };
-    render(
-      {
-        send: {
-          currentTransactionUUID: '1d40b578-6184-4607-8513-762c24d0a19b',
-          draftTransactions: {
-            '1d40b578-6184-4607-8513-762c24d0a19b': {
-              gas: {
-                error: null,
-                gasLimit: '0x5208',
-                gasPrice: '0x3b9aca00',
-                gasTotal: '0x157c9fbb9a000',
-                wasManuallyEdited: false,
-              },
-            },
-          },
+          layer1GasFee: '0x1',
         },
       },
-      state,
-    );
+    });
+
     await waitFor(() => {
-      expect(screen.queryByText('Layer 1 fees')).toBeInTheDocument();
-      expect(screen.queryByText('Layer 2 gas fee')).toBeInTheDocument();
+      expect(screen.queryByText('Estimated gas fee')).toBeInTheDocument();
+      expect(screen.queryByText('Max fee:')).toBeInTheDocument();
     });
   });
 });
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
index 116e674fe1da..c7e68cf9eed9 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
@@ -28,7 +28,6 @@ describe('Confirm Page Container Content', () => {
           },
         },
       },
-      identities: {},
       tokenList: {},
       internalAccounts: {
         accounts: {},
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
index 2bbda20bd117..0ee751357114 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import {
   ENVIRONMENT_TYPE_POPUP,
   ENVIRONMENT_TYPE_NOTIFICATION,
+  ORIGIN_METAMASK,
 } from '../../../../../../shared/constants/app';
 import { getEnvironmentType } from '../../../../../../app/scripts/lib/util';
 import NetworkDisplay from '../../../../../components/app/network-display';
@@ -18,6 +19,7 @@ export default function ConfirmPageContainerHeader({
   accountAddress,
   showAccountInHeader,
   children,
+  origin,
 }) {
   const t = useI18nContext();
   const windowType = getEnvironmentType();
@@ -48,23 +50,25 @@ export default function ConfirmPageContainerHeader({
             <AccountMismatchWarning address={accountAddress} />
           </div>
         ) : (
-          <div
-            className="confirm-page-container-header__back-button-container"
-            style={{
-              visibility: showEdit ? 'initial' : 'hidden',
-            }}
-          >
-            <Icon name={IconName.ArrowLeft} />
-            <span
-              data-testid="confirm-page-back-edit-button"
-              className="confirm-page-container-header__back-button"
-              onClick={() => onEdit()}
+          origin === ORIGIN_METAMASK && (
+            <div
+              className="confirm-page-container-header__back-button-container"
+              style={{
+                visibility: showEdit ? 'initial' : 'hidden',
+              }}
             >
-              {t('edit')}
-            </span>
-          </div>
+              <Icon name={IconName.ArrowLeft} />
+              <span
+                data-testid="confirm-page-back-edit-button"
+                className="confirm-page-container-header__back-button"
+                onClick={() => onEdit()}
+              >
+                {t('edit')}
+              </span>
+            </div>
+          )
         )}
-        {isFullScreen ? null : <NetworkDisplay />}
+        <NetworkDisplay />
       </div>
       {children}
     </div>
@@ -77,4 +81,5 @@ ConfirmPageContainerHeader.propTypes = {
   showEdit: PropTypes.bool,
   onEdit: PropTypes.func,
   children: PropTypes.node,
+  origin: PropTypes.string,
 };
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js
index e7043c283d19..6a48d8473a8e 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js
@@ -2,6 +2,7 @@ import React from 'react';
 import configureStore from 'redux-mock-store';
 import { NetworkStatus } from '@metamask/network-controller';
 import { NetworkType } from '@metamask/controller-utils';
+import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
 import { getEnvironmentType } from '../../../../../../app/scripts/lib/util';
 import ConfirmPageContainerHeader from '.';
@@ -38,6 +39,7 @@ describe('Confirm Detail Row Component', () => {
       onEdit: jest.fn(),
       showAccountInHeader: false,
       accountAddress: '0xmockAccountAddress',
+      origin: ORIGIN_METAMASK,
     };
 
     const { container } = renderWithProvider(
@@ -56,6 +58,7 @@ describe('Confirm Detail Row Component', () => {
       onEdit: jest.fn(),
       showAccountInHeader: false,
       accountAddress: '0xmockAccountAddress',
+      origin: ORIGIN_METAMASK,
     };
 
     const { container } = renderWithProvider(
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
index cfa93555448b..ba6228ad7bca 100755
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
@@ -52,8 +52,9 @@ const ConfirmPageContainerNavigation = () => {
   const onNextTx = (txId) => {
     if (txId) {
       dispatch(clearConfirmTransaction());
+      const position = enumUnapprovedTxs.indexOf(txId);
       history.push(
-        unconfirmedTransactions[currentPosition]?.msgParams
+        unconfirmedTransactions[position]?.msgParams
           ? `${CONFIRM_TRANSACTION_ROUTE}/${txId}${SIGNATURE_REQUEST_PATH}`
           : `${CONFIRM_TRANSACTION_ROUTE}/${txId}`,
       );
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js
index 841a12d0e232..ad546c81992f 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js
@@ -39,8 +39,6 @@ import SetApproveForAllWarning from '../set-approval-for-all-warning';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import useTransactionInsights from '../../../../hooks/useTransactionInsights';
-///: END:ONLY_INCLUDE_IF
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
 import InsightWarnings from '../../../../components/app/snaps/insight-warnings';
 ///: END:ONLY_INCLUDE_IF
 import {
@@ -120,7 +118,7 @@ const ConfirmPageContainer = (props) => {
   const trackEvent = useContext(MetaMetricsContext);
   ///: END:ONLY_INCLUDE_IF
   const [collectionBalance, setCollectionBalance] = useState('0');
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   const [isShowingTxInsightWarnings, setIsShowingTxInsightWarnings] =
     useState(false);
   ///: END:ONLY_INCLUDE_IF
@@ -177,7 +175,7 @@ const ConfirmPageContainer = (props) => {
 
   // TODO: Better name
   const topLevelHandleSubmit = () => {
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    ///: BEGIN:ONLY_INCLUDE_IF(snaps)
     if (insightObject?.warnings?.length > 0) {
       return setIsShowingTxInsightWarnings(true);
     }
@@ -219,6 +217,7 @@ const ConfirmPageContainer = (props) => {
             onEdit={() => onEdit()}
             showAccountInHeader={showAccountInHeader}
             accountAddress={fromAddress}
+            origin={origin}
           >
             {hideSenderToRecipient ? null : (
               <SenderToRecipient
@@ -380,7 +379,7 @@ const ConfirmPageContainer = (props) => {
           </>
         )}
         {
-          ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+          ///: BEGIN:ONLY_INCLUDE_IF(snaps)
         }
         {isShowingTxInsightWarnings && (
           <InsightWarnings
diff --git a/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js b/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js
index 58e4fb3386ce..ac6095a28921 100644
--- a/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js
+++ b/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js
@@ -4,8 +4,12 @@ import { ERC1155, ERC721 } from '@metamask/controller-utils';
 import mockState from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import configureStore from '../../../../store/store';
+import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
 import ConfirmSubTitle from './confirm-subtitle';
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 describe('ConfirmSubTitle', () => {
   let store;
   beforeEach(() => {
@@ -45,7 +49,7 @@ describe('ConfirmSubTitle', () => {
   it('should not return null if it is NFT Transfer', async () => {
     mockState.metamask.preferences.showFiatInTestnets = false;
     mockState.metamask.allNftContracts = {
-      [mockState.metamask.selectedAddress]: {
+      [mockSelectedInternalAccount.address]: {
         [mockState.metamask.providerConfig.chainId]: [{ address: '0x9' }],
       },
     };
diff --git a/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx b/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx
index 3ba302f697d9..5953815fa49a 100644
--- a/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx
+++ b/ui/pages/confirmations/components/confirm/blockaid-alert/blockaid-alert.tsx
@@ -2,24 +2,23 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 
 import { currentConfirmationSelector } from '../../../../../selectors';
-import { SecurityAlertResponse } from '../../../types/confirm';
+import useSignatureSecurityAlertResponse from '../../../hooks/useSignatureSecurityAlertResponse';
+import { SignatureRequestType } from '../../../types/confirm';
 import BlockaidBannerAlert from '../../security-provider-banner-alert/blockaid-banner-alert';
 
-type SignatureSecurityAlertResponsesState = {
-  metamask: {
-    signatureSecurityAlertResponses: SecurityAlertResponse[];
-  };
-};
-
 // todo: this component can be deleted once new alert imlementation is added
-const BlockaidAlert = () => {
-  const currentConfirmation = useSelector(currentConfirmationSelector);
-  const signatureSecurityAlertResponses = useSelector(
-    (state: SignatureSecurityAlertResponsesState) =>
-      state.metamask.signatureSecurityAlertResponses,
+const BlockaidAlert = ({ ...props }) => {
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as SignatureRequestType;
+
+  const currentSecurityAlertId =
+    currentConfirmation?.securityAlertResponse?.securityAlertId;
+  const signatureSecurityAlertResponse = useSignatureSecurityAlertResponse(
+    currentSecurityAlertId,
   );
 
-  if (!currentConfirmation?.securityAlertResponse?.securityAlertId) {
+  if (!currentSecurityAlertId) {
     return null;
   }
 
@@ -27,11 +26,9 @@ const BlockaidAlert = () => {
     <BlockaidBannerAlert
       txData={{
         ...currentConfirmation,
-        securityAlertResponse:
-          signatureSecurityAlertResponses?.[
-            currentConfirmation?.securityAlertResponse?.securityAlertId as any
-          ],
+        securityAlertResponse: signatureSecurityAlertResponse,
       }}
+      {...props}
     />
   );
 };
diff --git a/ui/pages/confirmations/components/confirm/footer/__snapshots__/footer.test.tsx.snap b/ui/pages/confirmations/components/confirm/footer/__snapshots__/footer.test.tsx.snap
index c19be26a6002..d83261c248c6 100644
--- a/ui/pages/confirmations/components/confirm/footer/__snapshots__/footer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/footer/__snapshots__/footer.test.tsx.snap
@@ -1,9 +1,29 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ConfirmFooter should match snapshot 1`] = `
+exports[`ConfirmFooter should match snapshot with signature confirmation 1`] = `
 <div>
   <div
-    class="mm-box multichain-page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
+    class="mm-box multichain-page-footer confirm-footer_page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
+  >
+    <button
+      class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+    >
+      Cancel
+    </button>
+    <button
+      class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+      data-testid="confirm-footer-confirm-button"
+    >
+      Confirm
+    </button>
+  </div>
+</div>
+`;
+
+exports[`ConfirmFooter should match snapshot with transaction confirmation 1`] = `
+<div>
+  <div
+    class="mm-box multichain-page-footer confirm-footer_page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
   >
     <button
       class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
index 70035116581c..7e3d629595de 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
@@ -1,14 +1,16 @@
 import React from 'react';
-import mockState from '../../../../../../test/data/mock-state.json';
-import { fireEvent, renderWithProvider } from '../../../../../../test/jest';
-import * as Actions from '../../../../../store/actions';
-import configureStore from '../../../../../store/store';
 import {
   LedgerTransportTypes,
   WebHIDConnectedStatuses,
 } from '../../../../../../shared/constants/hardware-wallets';
+import { BlockaidResultType } from '../../../../../../shared/constants/security-provider';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../test/data/confirmations/contract-interaction';
+import { unapprovedPersonalSignMsg } from '../../../../../../test/data/confirmations/personal_sign';
+import mockState from '../../../../../../test/data/mock-state.json';
+import { fireEvent, renderWithProvider } from '../../../../../../test/jest';
 import * as MMIConfirmations from '../../../../../hooks/useMMIConfirmations';
-
+import * as Actions from '../../../../../store/actions';
+import configureStore from '../../../../../store/store';
 import Footer from './footer';
 
 jest.mock('react-redux', () => ({
@@ -36,8 +38,23 @@ const render = (args = {}) => {
 };
 
 describe('ConfirmFooter', () => {
-  it('should match snapshot', () => {
-    const { container } = render();
+  it('should match snapshot with signature confirmation', () => {
+    const { container } = render({
+      confirm: {
+        currentConfirmation: unapprovedPersonalSignMsg,
+        isScrollToBottomNeeded: false,
+      },
+    });
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should match snapshot with transaction confirmation', () => {
+    const { container } = render({
+      confirm: {
+        currentConfirmation: genUnapprovedContractInteractionConfirmation(),
+        isScrollToBottomNeeded: false,
+      },
+    });
     expect(container).toMatchSnapshot();
   });
 
@@ -54,6 +71,8 @@ describe('ConfirmFooter', () => {
     const cancelButton = getAllByRole('button')[0];
     const rejectSpy = jest
       .spyOn(Actions, 'rejectPendingApproval')
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       .mockImplementation(() => ({} as any));
     fireEvent.click(cancelButton);
     expect(rejectSpy).toHaveBeenCalled();
@@ -64,11 +83,35 @@ describe('ConfirmFooter', () => {
     const submitButton = getAllByRole('button')[1];
     const resolveSpy = jest
       .spyOn(Actions, 'resolvePendingApproval')
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       .mockImplementation(() => ({} as any));
     fireEvent.click(submitButton);
     expect(resolveSpy).toHaveBeenCalled();
   });
 
+  it('displays a danger "Confirm" button if the request is malicious', async () => {
+    const mockSecurityAlertId = '8';
+    const { getAllByRole } = await render({
+      confirm: {
+        currentConfirmation: {
+          securityAlertResponse: {
+            securityAlertId: mockSecurityAlertId,
+          },
+        },
+      },
+      metamask: {
+        signatureSecurityAlertResponses: {
+          [mockSecurityAlertId]: {
+            result_type: BlockaidResultType.Malicious,
+          },
+        },
+      },
+    });
+    const submitButton = getAllByRole('button')[1];
+    expect(submitButton).toHaveClass('mm-button-primary--type-danger');
+  });
+
   it('disables submit button if required LedgerHidConnection is not yet established', () => {
     const { getAllByRole } = render({
       metamask: {
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.tsx b/ui/pages/confirmations/components/confirm/footer/footer.tsx
index 27c2825bd033..fcf1ae4ae591 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.tsx
@@ -1,7 +1,6 @@
+import { ethErrors, serializeError } from 'eth-rpc-errors';
 import React, { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { ethErrors, serializeError } from 'eth-rpc-errors';
-
 import {
   Button,
   ButtonSize,
@@ -9,27 +8,32 @@ import {
 } from '../../../../../components/component-library';
 import { Footer as PageFooter } from '../../../../../components/multichain/pages/page';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
+///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import { useMMIConfirmations } from '../../../../../hooks/useMMIConfirmations';
+///: END:ONLY_INCLUDE_IF
+
 import { doesAddressRequireLedgerHidConnection } from '../../../../../selectors';
 import {
   rejectPendingApproval,
   resolvePendingApproval,
 } from '../../../../../store/actions';
 import { confirmSelector } from '../../../selectors';
+import { getConfirmationSender } from '../utils';
+import useIsDangerButton from './useIsDangerButton';
 
 const Footer = () => {
+  const dispatch = useDispatch();
   const t = useI18nContext();
   const confirm = useSelector(confirmSelector);
+  const isDangerButton = useIsDangerButton();
+
   const { currentConfirmation, isScrollToBottomNeeded } = confirm;
+  const { from } = getConfirmationSender(currentConfirmation);
+
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const { mmiOnSignCallback, mmiSubmitDisabled } = useMMIConfirmations();
   ///: END:ONLY_INCLUDE_IF
 
-  let from: string | undefined;
-  // todo: extend to other confirmation types
-  if (currentConfirmation?.msgParams) {
-    from = currentConfirmation?.msgParams?.from;
-  }
   const hardwareWalletRequiresConnection = useSelector((state) => {
     if (from) {
       return doesAddressRequireLedgerHidConnection(state, from);
@@ -37,12 +41,11 @@ const Footer = () => {
     return false;
   });
 
-  const dispatch = useDispatch();
-
   const onCancel = useCallback(() => {
     if (!currentConfirmation) {
       return;
     }
+
     dispatch(
       rejectPendingApproval(
         currentConfirmation.id,
@@ -56,13 +59,14 @@ const Footer = () => {
       return;
     }
     dispatch(resolvePendingApproval(currentConfirmation.id, undefined));
+
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     mmiOnSignCallback();
     ///: END:ONLY_INCLUDE_IF
   }, [currentConfirmation]);
 
   return (
-    <PageFooter>
+    <PageFooter className="confirm-footer_page-footer">
       <Button
         block
         onClick={onCancel}
@@ -76,6 +80,7 @@ const Footer = () => {
         data-testid="confirm-footer-confirm-button"
         onClick={onSubmit}
         size={ButtonSize.Lg}
+        danger={isDangerButton}
         disabled={
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           mmiSubmitDisabled ||
diff --git a/ui/pages/confirmations/components/confirm/footer/index.scss b/ui/pages/confirmations/components/confirm/footer/index.scss
new file mode 100644
index 000000000000..5800cdbbe6c1
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/footer/index.scss
@@ -0,0 +1,6 @@
+.confirm-footer {
+  &_page-footer {
+    box-shadow: var(--shadow-size-md) var(--color-shadow-default);
+    z-index: 1;
+  }
+}
diff --git a/ui/pages/confirmations/components/confirm/footer/useIsDangerButton.ts b/ui/pages/confirmations/components/confirm/footer/useIsDangerButton.ts
new file mode 100644
index 000000000000..73d626f26cdf
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/footer/useIsDangerButton.ts
@@ -0,0 +1,23 @@
+import { useSelector } from 'react-redux';
+import useSignatureSecurityAlertResponse from '../../../hooks/useSignatureSecurityAlertResponse';
+import { currentConfirmationSelector } from '../../../selectors';
+import { SecurityAlertResponse } from '../../../types/confirm';
+import { BlockaidResultType } from '../../../../../../shared/constants/security-provider';
+
+const useIsDangerButton = () => {
+  const currentConfirmation = useSelector(currentConfirmationSelector);
+
+  const currentSecurityAlertId = (
+    currentConfirmation?.securityAlertResponse as SecurityAlertResponse
+  )?.securityAlertId;
+
+  const signatureSecurityAlertResponse = useSignatureSecurityAlertResponse(
+    currentSecurityAlertId,
+  );
+
+  return (
+    signatureSecurityAlertResponse?.result_type === BlockaidResultType.Malicious
+  );
+};
+
+export default useIsDangerButton;
diff --git a/ui/pages/confirmations/components/confirm/header/__snapshots__/header-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/header/__snapshots__/header-info.test.tsx.snap
index 0e07482942c1..283875972a0a 100644
--- a/ui/pages/confirmations/components/confirm/header/__snapshots__/header-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/header/__snapshots__/header-info.test.tsx.snap
@@ -18,6 +18,7 @@ exports[`Header should match snapshot 1`] = `
         <button
           aria-label="Account details"
           class="mm-box mm-button-icon mm-button-icon--size-md mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+          data-testid="header-info-button"
         >
           <span
             class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap b/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap
index 413d425cccc8..3586c380bd37 100644
--- a/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap
@@ -1,6 +1,114 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Header should match snapshot 1`] = `
+exports[`Header should match snapshot with signature confirmation 1`] = `
+<div>
+  <div
+    class="mm-box confirm_header__wrapper mm-box--display-flex mm-box--justify-content-space-between mm-box--align-items-center"
+  >
+    <div
+      class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--align-items-flex-start"
+    >
+      <div
+        class="mm-box mm-box--margin-top-2 mm-box--display-flex"
+      >
+        <div
+          class=""
+        >
+          <div
+            class="identicon"
+            style="height: 32px; width: 32px; border-radius: 16px;"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(3, 73, 94);"
+            >
+              <svg
+                height="32"
+                width="32"
+                x="0"
+                y="0"
+              >
+                <rect
+                  fill="#FB184D"
+                  height="32"
+                  transform="translate(-0.010232866814926739 -2.467961361206475) rotate(274.3 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#1888F2"
+                  height="32"
+                  transform="translate(0.7019171336752298 13.759175028660584) rotate(203.5 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#FA8900"
+                  height="32"
+                  transform="translate(28.820219003567207 11.830135279564011) rotate(192.7 16 16)"
+                  width="32"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          C
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--margin-inline-start-4"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-default"
+        />
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+        >
+          Chain 5
+        </p>
+      </div>
+    </div>
+    <div
+      class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--align-items-flex-end"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--justify-content-flex-end"
+        style="align-self: flex-end;"
+      >
+        <div>
+          <div
+            aria-describedby="tippy-tooltip-1"
+            class=""
+            data-original-title="Account details"
+            data-tooltipped=""
+            style="display: inline;"
+            tabindex="0"
+          >
+            <button
+              aria-label="Account details"
+              class="mm-box mm-button-icon mm-button-icon--size-md mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+              data-testid="header-info-button"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
+                style="mask-image: url('./images/icons/info.svg');"
+              />
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Header should match snapshot with transaction confirmation 1`] = `
 <div>
   <div
     class="mm-box confirm_header__wrapper mm-box--display-flex mm-box--justify-content-space-between mm-box--align-items-center"
@@ -58,22 +166,20 @@ exports[`Header should match snapshot 1`] = `
         <div
           class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
         >
-          C
+          ?
         </div>
       </div>
       <div
         class="mm-box mm-box--margin-inline-start-4"
       >
         <p
-          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-default"
         >
           Test Account
         </p>
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
-        >
-          Chain 5
-        </p>
+        />
       </div>
     </div>
     <div
@@ -85,7 +191,7 @@ exports[`Header should match snapshot 1`] = `
       >
         <div>
           <div
-            aria-describedby="tippy-tooltip-1"
+            aria-describedby="tippy-tooltip-2"
             class=""
             data-original-title="Account details"
             data-tooltipped=""
@@ -95,6 +201,7 @@ exports[`Header should match snapshot 1`] = `
             <button
               aria-label="Account details"
               class="mm-box mm-button-icon mm-button-icon--size-md mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+              data-testid="header-info-button"
             >
               <span
                 class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/header/header-info.test.tsx b/ui/pages/confirmations/components/confirm/header/header-info.test.tsx
index d88d298c66bc..ef43b98c69a0 100644
--- a/ui/pages/confirmations/components/confirm/header/header-info.test.tsx
+++ b/ui/pages/confirmations/components/confirm/header/header-info.test.tsx
@@ -3,24 +3,33 @@ import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import mockState from '../../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../../test/jest';
+import { MetaMetricsContext } from '../../../../../contexts/metametrics';
 import configureStore from '../../../../../store/store';
 
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventLocation,
+  MetaMetricsEventName,
+} from '../../../../../../shared/constants/metametrics';
+
 import HeaderInfo from './header-info';
 
-const render = () => {
-  const store = configureStore({
-    metamask: {
-      ...mockState.metamask,
-    },
-    confirm: {
-      currentConfirmation: {
-        msgParams: {
-          from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-        },
+const mockStore = {
+  metamask: {
+    ...mockState.metamask,
+  },
+  confirm: {
+    currentConfirmation: {
+      msgParams: {
+        from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
       },
+      type: 'eth_signTypedData_v4',
     },
-  });
+  },
+};
 
+const render = () => {
+  const store = configureStore(mockStore);
   return renderWithProvider(<HeaderInfo />, store);
 };
 
@@ -33,22 +42,38 @@ describe('Header', () => {
     const { getByLabelText } = render();
     expect(getByLabelText('Account details')).toBeInTheDocument();
   });
-  it('shows modal when account info icon is clicked', async () => {
-    const { getByLabelText, queryByTestId } = render();
-    expect(queryByTestId('account-details-modal')).not.toBeInTheDocument();
-    const accountInfoIcon = getByLabelText('Account details');
-    fireEvent.click(accountInfoIcon);
-    await waitFor(() => {
-      expect(queryByTestId('account-details-modal')).toBeInTheDocument();
+
+  describe('when account info icon is clicked', () => {
+    it('shows account info modal with address', async () => {
+      const { getByLabelText, getByText, queryByTestId } = render();
+      const accountInfoIcon = getByLabelText('Account details');
+      fireEvent.click(accountInfoIcon);
+      await waitFor(() => {
+        expect(queryByTestId('account-details-modal')).toBeInTheDocument();
+        expect(getByText('0x0DCD5...3E7bc')).toBeInTheDocument();
+      });
     });
-  });
-  it('shows account info modal with address', async () => {
-    const { getByLabelText, getByText, queryByTestId } = render();
-    const accountInfoIcon = getByLabelText('Account details');
-    fireEvent.click(accountInfoIcon);
-    await waitFor(() => {
-      expect(queryByTestId('account-details-modal')).toBeInTheDocument();
-      expect(getByText('0x0DCD5...3E7bc')).toBeInTheDocument();
+
+    it(`sends "${MetaMetricsEventName.AccountDetailsOpened}" metametric`, () => {
+      const mockTrackEvent = jest.fn();
+      const { getByLabelText } = renderWithProvider(
+        <MetaMetricsContext.Provider value={mockTrackEvent}>
+          <HeaderInfo />
+        </MetaMetricsContext.Provider>,
+        configureStore(mockStore),
+      );
+      const accountInfoIcon = getByLabelText('Account details');
+      fireEvent.click(accountInfoIcon);
+
+      expect(mockTrackEvent).toHaveBeenNthCalledWith(1, {
+        category: MetaMetricsEventCategory.Transactions,
+        event: MetaMetricsEventName.AccountDetailsOpened,
+        properties: {
+          action: 'Confirm Screen',
+          location: MetaMetricsEventLocation.SignatureConfirmation,
+          signature_type: 'eth_signTypedData_v4',
+        },
+      });
     });
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/header/header-info.tsx b/ui/pages/confirmations/components/confirm/header/header-info.tsx
index 3b8fba52e01f..cfec6a0a569f 100644
--- a/ui/pages/confirmations/components/confirm/header/header-info.tsx
+++ b/ui/pages/confirmations/components/confirm/header/header-info.tsx
@@ -1,5 +1,12 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventLocation,
+  MetaMetricsEventName,
+} from '../../../../../../shared/constants/metametrics';
+import { ConfirmInfoRow } from '../../../../../components/app/confirm/info/row';
+import { ConfirmInfoRowCurrency } from '../../../../../components/app/confirm/info/row/currency';
 import {
   AvatarAccount,
   AvatarAccountSize,
@@ -15,32 +22,52 @@ import {
   ModalOverlay,
   Text,
 } from '../../../../../components/component-library';
+import { AddressCopyButton } from '../../../../../components/multichain';
+import Tooltip from '../../../../../components/ui/tooltip/tooltip';
+import { MetaMetricsContext } from '../../../../../contexts/metametrics';
 import {
   AlignItems,
   Display,
   FlexDirection,
   FontWeight,
+  IconColor,
   JustifyContent,
+  TextColor,
+  TextVariant,
 } from '../../../../../helpers/constants/design-system';
-import { ConfirmInfoRow } from '../../../../../components/app/confirm/info/row';
-import { AddressCopyButton } from '../../../../../components/multichain';
-import Tooltip from '../../../../../components/ui/tooltip/tooltip';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
-import useConfirmationRecipientInfo from '../../../hooks/useConfirmationRecipientInfo';
-import { getUseBlockie } from '../../../../../selectors';
-import { ConfirmInfoRowCurrency } from '../../../../../components/app/confirm/info/row/currency';
+import {
+  currentConfirmationSelector,
+  getUseBlockie,
+} from '../../../../../selectors';
 import { useBalance } from '../../../hooks/useBalance';
+import useConfirmationRecipientInfo from '../../../hooks/useConfirmationRecipientInfo';
 
 const HeaderInfo = () => {
   const useBlockie = useSelector(getUseBlockie);
   const [showAccountInfo, setShowAccountInfo] = React.useState(false);
-  const { recipientAddress: fromAddress, recipientName: fromName } =
+
+  const currentConfirmation = useSelector(currentConfirmationSelector);
+  const { senderAddress: fromAddress, senderName: fromName } =
     useConfirmationRecipientInfo();
 
   const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
 
   const { balance: balanceToUse } = useBalance(fromAddress);
 
+  function trackAccountModalOpened() {
+    trackEvent({
+      category: MetaMetricsEventCategory.Transactions,
+      event: MetaMetricsEventName.AccountDetailsOpened,
+      properties: {
+        action: 'Confirm Screen',
+        location: MetaMetricsEventLocation.SignatureConfirmation,
+        signature_type: currentConfirmation?.type,
+      },
+    });
+  }
+
   return (
     <>
       <Box
@@ -53,9 +80,14 @@ const HeaderInfo = () => {
         <Tooltip position="bottom" title={t('accountDetails')} interactive>
           <ButtonIcon
             ariaLabel={t('accountDetails')}
+            color={IconColor.iconDefault}
             iconName={IconName.Info}
+            data-testid="header-info-button"
             size={ButtonIconSize.Md}
-            onClick={() => setShowAccountInfo(true)}
+            onClick={() => {
+              trackAccountModalOpened();
+              setShowAccountInfo(true);
+            }}
           />
         </Tooltip>
       </Box>
@@ -69,7 +101,11 @@ const HeaderInfo = () => {
         <ModalOverlay />
         <ModalContent>
           <ModalHeader>
-            <Box display={Display.Flex} justifyContent={JustifyContent.center}>
+            <Box
+              display={Display.Flex}
+              justifyContent={JustifyContent.center}
+              style={{ position: 'relative' }}
+            >
               <Box
                 style={{ margin: '0 auto' }}
                 display={Display.Flex}
@@ -86,14 +122,16 @@ const HeaderInfo = () => {
                   address={fromAddress}
                   size={AvatarAccountSize.Lg}
                 />
-                <Text fontWeight={FontWeight.Bold} marginTop={2}>
+                <Text
+                  fontWeight={FontWeight.Bold}
+                  variant={TextVariant.bodyMd}
+                  color={TextColor.textDefault}
+                  marginTop={2}
+                >
                   {fromName}
                 </Text>
               </Box>
-              <Box
-                display={Display.Flex}
-                justifyContent={JustifyContent.flexEnd}
-              >
+              <Box style={{ position: 'absolute', right: 0 }}>
                 <ButtonIcon
                   ariaLabel={t('close')}
                   iconName={IconName.Close}
@@ -109,7 +147,10 @@ const HeaderInfo = () => {
               <AddressCopyButton address={fromAddress} shorten={true} />
             </ConfirmInfoRow>
             <ConfirmInfoRow label="Balance">
-              <ConfirmInfoRowCurrency value={balanceToUse ?? 0} />
+              <ConfirmInfoRowCurrency
+                value={balanceToUse ?? 0}
+                dataTestId="header-balance"
+              />
             </ConfirmInfoRow>
           </ModalBody>
         </ModalContent>
diff --git a/ui/pages/confirmations/components/confirm/header/header.scss b/ui/pages/confirmations/components/confirm/header/header.scss
index e9b39baf461b..f75c1059e6a7 100644
--- a/ui/pages/confirmations/components/confirm/header/header.scss
+++ b/ui/pages/confirmations/components/confirm/header/header.scss
@@ -2,6 +2,7 @@
   &__wrapper {
     box-shadow: var(--shadow-size-md) var(--color-shadow-default);
     height: 64px;
+    z-index: 1;
   }
 
   &__avatar-network {
diff --git a/ui/pages/confirmations/components/confirm/header/header.test.tsx b/ui/pages/confirmations/components/confirm/header/header.test.tsx
index 9584c75b4608..e173624a3059 100644
--- a/ui/pages/confirmations/components/confirm/header/header.test.tsx
+++ b/ui/pages/confirmations/components/confirm/header/header.test.tsx
@@ -1,13 +1,16 @@
-import React from 'react';
-
 import { fireEvent, waitFor } from '@testing-library/react';
+import React from 'react';
+import {
+  DEPOSIT_METHOD_DATA,
+  genUnapprovedContractInteractionConfirmation,
+} from '../../../../../../test/data/confirmations/contract-interaction';
+import { unapprovedPersonalSignMsg } from '../../../../../../test/data/confirmations/personal_sign';
 import mockState from '../../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../../test/jest';
 import configureStore from '../../../../../store/store';
-
 import Header from './header';
 
-const render = () => {
+const render = (storeOverrides = {}) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
@@ -19,16 +22,34 @@ const render = () => {
         },
       },
     },
+    ...storeOverrides,
   });
 
   return renderWithProvider(<Header />, store);
 };
 
 describe('Header', () => {
-  it('should match snapshot', async () => {
-    const { container } = render();
+  it('should match snapshot with signature confirmation', () => {
+    const { container } = render({
+      confirm: { currentConfirmation: unapprovedPersonalSignMsg },
+    });
+
     expect(container).toMatchSnapshot();
   });
+
+  it('should match snapshot with transaction confirmation', () => {
+    const { container } = render({
+      confirm: {
+        currentConfirmation: genUnapprovedContractInteractionConfirmation({
+          address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+          txData: DEPOSIT_METHOD_DATA,
+        }),
+      },
+    });
+
+    expect(container).toMatchSnapshot();
+  });
+
   it('contains network name and account name', () => {
     const { getByText } = render();
     expect(getByText('Test Account')).toBeInTheDocument();
diff --git a/ui/pages/confirmations/components/confirm/header/header.tsx b/ui/pages/confirmations/components/confirm/header/header.tsx
index 9ff08612a71f..83ab921d4c36 100644
--- a/ui/pages/confirmations/components/confirm/header/header.tsx
+++ b/ui/pages/confirmations/components/confirm/header/header.tsx
@@ -1,26 +1,26 @@
 import React from 'react';
-
-import useConfirmationNetworkInfo from '../../../hooks/useConfirmationNetworkInfo';
-import useConfirmationRecipientInfo from '../../../hooks/useConfirmationRecipientInfo';
-import {
-  AlignItems,
-  Display,
-  JustifyContent,
-  TextColor,
-} from '../../../../../helpers/constants/design-system';
-
-import Identicon from '../../../../../components/ui/identicon';
 import {
   AvatarNetwork,
   AvatarNetworkSize,
   Box,
   Text,
 } from '../../../../../components/component-library';
+import Identicon from '../../../../../components/ui/identicon';
+import {
+  AlignItems,
+  Display,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+} from '../../../../../helpers/constants/design-system';
+import { getAvatarNetworkColor } from '../../../../../helpers/utils/accounts';
+import useConfirmationNetworkInfo from '../../../hooks/useConfirmationNetworkInfo';
+import useConfirmationRecipientInfo from '../../../hooks/useConfirmationRecipientInfo';
 import HeaderInfo from './header-info';
 
 const Header = () => {
   const { networkImageUrl, networkDisplayName } = useConfirmationNetworkInfo();
-  const { recipientAddress: fromAddress, recipientName: fromName } =
+  const { senderAddress: fromAddress, senderName: fromName } =
     useConfirmationRecipientInfo();
 
   return (
@@ -37,11 +37,17 @@ const Header = () => {
             src={networkImageUrl}
             name={networkDisplayName}
             size={AvatarNetworkSize.Xs}
+            backgroundColor={getAvatarNetworkColor(networkDisplayName)}
             className="confirm_header__avatar-network"
           />
         </Box>
         <Box marginInlineStart={4}>
-          <Text>{fromName}</Text>
+          <Text
+            color={TextColor.textDefault}
+            variant={TextVariant.bodyMdMedium}
+          >
+            {fromName}
+          </Text>
           <Text color={TextColor.textAlternative}>{networkDisplayName}</Text>
         </Box>
       </Box>
diff --git a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
index 492f702f4cbd..1c937f317140 100644
--- a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
@@ -27,7 +27,7 @@ exports[`Info renders info section for personal sign request 1`] = `
             tabindex="0"
           >
             <span
-              class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
               style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
@@ -39,7 +39,7 @@ exports[`Info renders info section for personal sign request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
         >
-          https://metamask.github.io
+          metamask.github.io
         </p>
       </div>
     </div>
@@ -65,6 +65,7 @@ exports[`Info renders info section for personal sign request 1`] = `
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
         >
           Example \`personal_sign\` message
         </p>
@@ -101,7 +102,7 @@ exports[`Info renders info section for typed sign request 1`] = `
             tabindex="0"
           >
             <span
-              class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
               style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
@@ -113,7 +114,7 @@ exports[`Info renders info section for typed sign request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
         >
-          https://metamask.github.io
+          metamask.github.io
         </p>
       </div>
     </div>
@@ -207,11 +208,10 @@ exports[`Info renders info section for typed sign request 1`] = `
       </div>
       <div
         class="mm-box mm-box--width-full"
-        style="margin: 0px -8px;"
       >
         <div
           class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-          style="overflow-wrap: anywhere; min-height: 24px;"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -227,6 +227,7 @@ exports[`Info renders info section for typed sign request 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
             >
               Mail
             </p>
@@ -234,210 +235,240 @@ exports[`Info renders info section for typed sign request 1`] = `
         </div>
         <div
           class="mm-box"
-          style="margin: 0px -8px;"
+          style="margin-left: -8px;"
         >
           <div
-            class="mm-box mm-box--margin-left-2"
+            class="mm-box mm-box--width-full"
           >
             <div
-              class="mm-box mm-box--margin-left-2"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Name:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  >
-                    Cow
-                  </p>
-                </div>
+                  From:
+                </p>
               </div>
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--width-full"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Name:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
                   >
-                    Wallet:
-                  </p>
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Cow
+                    </p>
+                  </div>
                 </div>
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Wallet:
+                    </p>
+                  </div>
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
+                          class="mm-avatar-account__jazzicon"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
                           >
-                            <rect
-                              fill="#FA7900"
-                              height="16"
-                              transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#034F5E"
-                              height="16"
-                              transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#FB185C"
+                            <svg
                               height="16"
-                              transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
                               width="16"
                               x="0"
                               y="0"
-                            />
-                          </svg>
+                            >
+                              <rect
+                                fill="#FA7900"
+                                height="16"
+                                transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#034F5E"
+                                height="16"
+                                transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#FB185C"
+                                height="16"
+                                transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xCD2a3...DD826
+                      </p>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xCD2a3...DD826
-                    </p>
                   </div>
                 </div>
               </div>
             </div>
             <div
-              class="mm-box mm-box--margin-left-2"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Name:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  >
-                    Bob
-                  </p>
-                </div>
+                  To:
+                </p>
               </div>
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--width-full"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Name:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
                   >
-                    Wallet:
-                  </p>
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Bob
+                    </p>
+                  </div>
                 </div>
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Wallet:
+                    </p>
+                  </div>
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                          class="mm-avatar-account__jazzicon"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
                           >
-                            <rect
-                              fill="#C8144A"
-                              height="16"
-                              transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#01878E"
-                              height="16"
-                              transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#1897F2"
+                            <svg
                               height="16"
-                              transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
                               width="16"
                               x="0"
                               y="0"
-                            />
-                          </svg>
+                            >
+                              <rect
+                                fill="#C8144A"
+                                height="16"
+                                transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#01878E"
+                                height="16"
+                                transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#1897F2"
+                                height="16"
+                                transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xbBbBB...bBBbB
+                      </p>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xbBbBB...bBBbB
-                    </p>
                   </div>
                 </div>
               </div>
             </div>
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -453,6 +484,7 @@ exports[`Info renders info section for typed sign request 1`] = `
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
                 >
                   Hello, Bob!
                 </p>
diff --git a/ui/pages/confirmations/components/confirm/info/contract-interaction/__snapshots__/contract-interaction.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/contract-interaction/__snapshots__/contract-interaction.test.tsx.snap
new file mode 100644
index 000000000000..2e9543b076d7
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/contract-interaction/__snapshots__/contract-interaction.test.tsx.snap
@@ -0,0 +1,226 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ContractInteractionInfo /> does not render if required data is not present in the transaction 1`] = `<div />`;
+
+exports[`<ContractInteractionInfo /> renders component for contract interaction request 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--margin-bottom-4 mm-box--background-color-background-default mm-box--rounded-md"
+  >
+    <div
+      class="mm-box simulation-details-layout mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+      data-testid="simulation-details-layout"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-default"
+          >
+            Estimated changes
+          </p>
+          <div
+            class="info-tooltip"
+            data-testid="info-tooltip"
+          >
+            <div>
+              <div
+                aria-describedby="tippy-tooltip-1"
+                class="info-tooltip__tooltip-container"
+                data-original-title="null"
+                data-tooltipped=""
+                style="display: inline;"
+                tabindex="0"
+              >
+                <svg
+                  viewBox="0 0 10 10"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M5 0C2.2 0 0 2.2 0 5s2.2 5 5 5 5-2.2 5-5-2.2-5-5-5zm0 2c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.2-.7-.6.3-.8.7-.8zm.7 6H4.3V4.3h1.5V8z"
+                    fill="var(--color-icon-muted)"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          role="progressbar"
+        >
+          <svg
+            class="preloader__icon"
+            fill="none"
+            height="20"
+            viewBox="0 0 16 16"
+            width="20"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+              fill="var(--color-primary-muted)"
+              fill-rule="evenodd"
+            />
+            <mask
+              height="16"
+              id="mask0"
+              mask-type="alpha"
+              maskUnits="userSpaceOnUse"
+              width="16"
+              x="0"
+              y="0"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+                fill="var(--color-primary-default)"
+                fill-rule="evenodd"
+              />
+            </mask>
+            <g
+              mask="url(#mask0)"
+            >
+              <path
+                d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+                fill="var(--color-primary-default)"
+              />
+            </g>
+          </svg>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Request from
+        </p>
+        <div>
+          <div
+            aria-describedby="tippy-tooltip-2"
+            class=""
+            data-original-title="This is the site asking for your confirmation."
+            data-tooltipped=""
+            style="display: flex;"
+            tabindex="0"
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              style="mask-image: url('./images/icons/question.svg');"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+        >
+          metamask.github.io
+        </p>
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Interacting with
+        </p>
+        <div>
+          <div
+            aria-describedby="tippy-tooltip-3"
+            class=""
+            data-original-title="This is the contract you're interacting with. Protect yourself from scammers by  verifying the details."
+            data-tooltipped=""
+            style="display: flex;"
+            tabindex="0"
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              style="mask-image: url('./images/icons/question.svg');"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          >
+            <div
+              class="mm-avatar-account__jazzicon"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 98);"
+              >
+                <svg
+                  height="16"
+                  width="16"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#018E82"
+                    height="16"
+                    transform="translate(0.09338133124744565 -0.04490608666778058) rotate(456.7 8 8)"
+                    width="16"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#FB187B"
+                    height="16"
+                    transform="translate(-6.3240369287990985 -1.0053822898747908) rotate(305.5 8 8)"
+                    width="16"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#237CE1"
+                    height="16"
+                    transform="translate(4.0809955633515935 -14.427164334848008) rotate(395.8 8 8)"
+                    width="16"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+            data-testid="confirm-info-row-display-name"
+          >
+            0x88AA6...A5125
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.stories.tsx b/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.stories.tsx
new file mode 100644
index 000000000000..780b27ac3d1a
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.stories.tsx
@@ -0,0 +1,33 @@
+import { Meta } from '@storybook/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../../test/data/confirmations/contract-interaction';
+import mockState from '../../../../../../../test/data/mock-state.json';
+import configureStore from '../../../../../../store/store';
+import ContractInteractionInfo from './contract-interaction';
+
+const store = configureStore({
+  ...mockState,
+  metamask: {
+    ...mockState.metamask,
+  },
+  confirm: {
+    currentConfirmation: genUnapprovedContractInteractionConfirmation(),
+  },
+});
+
+const Story = {
+  title: 'Components/App/Confirm/info/ContractInteractionInfo',
+  component: ContractInteractionInfo,
+  decorators: [
+    (story: () => Meta<typeof ContractInteractionInfo>) => (
+      <Provider store={store}>{story()}</Provider>
+    ),
+  ],
+};
+
+export default Story;
+
+export const DefaultStory = () => <ContractInteractionInfo />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.test.tsx b/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.test.tsx
new file mode 100644
index 000000000000..9468a1b747d4
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.test.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import thunk from 'redux-thunk';
+import configureMockStore from 'redux-mock-store';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../../test/data/confirmations/contract-interaction';
+import mockState from '../../../../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../../../../test/lib/render-helpers';
+import ContractInteractionInfo from './contract-interaction';
+
+describe('<ContractInteractionInfo />', () => {
+  const middleware = [thunk];
+
+  it('renders component for contract interaction request', () => {
+    const state = {
+      ...mockState,
+      confirm: {
+        currentConfirmation: genUnapprovedContractInteractionConfirmation(),
+      },
+    };
+    const mockStore = configureMockStore(middleware)(state);
+    const { container } = renderWithProvider(
+      <ContractInteractionInfo />,
+      mockStore,
+    );
+    expect(container).toMatchSnapshot();
+  });
+
+  it('does not render if required data is not present in the transaction', () => {
+    const state = {
+      ...mockState,
+      confirm: {
+        currentConfirmation: {
+          id: '0050d5b0-c023-11ee-a0cb-3390a510a0ab',
+          status: 'unapproved',
+          time: new Date().getTime(),
+          type: 'json_request',
+        },
+      },
+    };
+    const mockStore = configureMockStore(middleware)(state);
+    const { container } = renderWithProvider(
+      <ContractInteractionInfo />,
+      mockStore,
+    );
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.tsx b/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.tsx
new file mode 100644
index 000000000000..0f5af1d92ed7
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/contract-interaction/contract-interaction.tsx
@@ -0,0 +1,47 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { Box } from '../../../../../../components/component-library';
+import {
+  BackgroundColor,
+  BorderRadius,
+} from '../../../../../../helpers/constants/design-system';
+import { currentConfirmationSelector } from '../../../../../../selectors';
+import { SimulationDetails } from '../../../simulation-details';
+import { TransactionDetails } from '../shared/transaction-details';
+
+const ContractInteractionInfo: React.FC = () => {
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as TransactionMeta;
+
+  if (!currentConfirmation?.txParams) {
+    return null;
+  }
+
+  return (
+    <>
+      <Box
+        backgroundColor={BackgroundColor.backgroundDefault}
+        borderRadius={BorderRadius.MD}
+        marginBottom={4}
+      >
+        <SimulationDetails
+          simulationData={currentConfirmation.simulationData}
+          transactionId={currentConfirmation.id}
+          isTransactionsRedesign
+        />
+      </Box>
+      <Box
+        backgroundColor={BackgroundColor.backgroundDefault}
+        borderRadius={BorderRadius.MD}
+        padding={2}
+        marginBottom={4}
+      >
+        <TransactionDetails />
+      </Box>
+    </>
+  );
+};
+
+export default ContractInteractionInfo;
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/known-method-data-in-transaction.test.ts b/ui/pages/confirmations/components/confirm/info/hooks/known-method-data-in-transaction.test.ts
new file mode 100644
index 000000000000..4b24fb21db9e
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/known-method-data-in-transaction.test.ts
@@ -0,0 +1,80 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  CONTRACT_INTERACTION_SENDER_ADDRESS,
+  genUnapprovedContractInteractionConfirmation,
+} from '../../../../../../../test/data/confirmations/contract-interaction';
+import mockState from '../../../../../../../test/data/mock-state.json';
+import { renderHookWithProvider } from '../../../../../../../test/lib/render-helpers';
+import { useKnownMethodDataInTransaction } from './known-method-data-in-transaction';
+
+describe('useKnownMethodDataInTransaction', () => {
+  const depositHexData = '0xd0e30db0';
+
+  it('returns the method name and params', () => {
+    const currentConfirmation = genUnapprovedContractInteractionConfirmation({
+      address: CONTRACT_INTERACTION_SENDER_ADDRESS,
+      txData: depositHexData,
+    }) as TransactionMeta;
+
+    const { result } = renderHookWithProvider(
+      () => useKnownMethodDataInTransaction(currentConfirmation),
+      {
+        ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          use4ByteResolution: true,
+          knownMethodData: {
+            [depositHexData]: { name: 'Deposit', params: [] },
+          },
+        },
+      },
+    );
+
+    expect(result.current.knownMethodData.name).toEqual('Deposit');
+    expect(result.current.knownMethodData.params).toEqual([]);
+  });
+
+  it('returns no known method data if resolution is turned off', () => {
+    const currentConfirmation = genUnapprovedContractInteractionConfirmation({
+      address: CONTRACT_INTERACTION_SENDER_ADDRESS,
+      txData: depositHexData,
+    }) as TransactionMeta;
+
+    const { result } = renderHookWithProvider(
+      () => useKnownMethodDataInTransaction(currentConfirmation),
+      {
+        ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          use4ByteResolution: false,
+          knownMethodData: {
+            [depositHexData]: { name: 'Deposit', params: [] },
+          },
+        },
+      },
+    );
+
+    expect(result.current.knownMethodData).toEqual({});
+  });
+
+  it("returns no method data if it's not known even if resolution is enabled", () => {
+    const currentConfirmation = genUnapprovedContractInteractionConfirmation({
+      address: CONTRACT_INTERACTION_SENDER_ADDRESS,
+      txData: depositHexData,
+    }) as TransactionMeta;
+
+    const { result } = renderHookWithProvider(
+      () => useKnownMethodDataInTransaction(currentConfirmation),
+      {
+        ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          use4ByteResolution: true,
+          knownMethodData: {},
+        },
+      },
+    );
+
+    expect(result.current.knownMethodData).toEqual({});
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/known-method-data-in-transaction.ts b/ui/pages/confirmations/components/confirm/info/hooks/known-method-data-in-transaction.ts
new file mode 100644
index 000000000000..821fbeaa9b5a
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/known-method-data-in-transaction.ts
@@ -0,0 +1,21 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  getKnownMethodData,
+  use4ByteResolutionSelector,
+} from '../../../../../../selectors';
+import { getContractMethodData } from '../../../../../../store/actions';
+
+export const useKnownMethodDataInTransaction = (
+  currentConfirmation: TransactionMeta,
+) => {
+  const dispatch = useDispatch();
+  const use4ByteResolution = useSelector(use4ByteResolutionSelector);
+  const transactionData = currentConfirmation?.txParams?.data;
+  if (use4ByteResolution && transactionData) {
+    dispatch(getContractMethodData(currentConfirmation.txParams.data));
+  }
+  const knownMethodData =
+    useSelector((state) => getKnownMethodData(state, transactionData)) || {};
+  return { knownMethodData };
+};
diff --git a/ui/pages/confirmations/components/confirm/info/info.tsx b/ui/pages/confirmations/components/confirm/info/info.tsx
index b0607a22ab7f..ac35d289d0c0 100644
--- a/ui/pages/confirmations/components/confirm/info/info.tsx
+++ b/ui/pages/confirmations/components/confirm/info/info.tsx
@@ -1,30 +1,42 @@
-import React, { memo } from 'react';
-import { useSelector } from 'react-redux';
-
 import { TransactionType } from '@metamask/transaction-controller';
-
+import React, { useMemo } from 'react';
+import { useSelector } from 'react-redux';
 import { currentConfirmationSelector } from '../../../../../selectors';
+import { SignatureRequestType } from '../../../types/confirm';
+import ContractInteractionInfo from './contract-interaction/contract-interaction';
 import PersonalSignInfo from './personal-sign/personal-sign';
+import TypedSignV1Info from './typed-sign-v1/typed-sign-v1';
 import TypedSignInfo from './typed-sign/typed-sign';
 
-const ConfirmationInfoConponentMap = {
-  [TransactionType.personalSign]: PersonalSignInfo,
-  [TransactionType.signTypedData]: TypedSignInfo,
-};
-
-type ConfirmationType = keyof typeof ConfirmationInfoConponentMap;
-
-const Info: React.FC = memo(() => {
+const Info: React.FC = () => {
   const currentConfirmation = useSelector(currentConfirmationSelector);
 
+  const ConfirmationInfoComponentMap = useMemo(
+    () => ({
+      [TransactionType.personalSign]: () => PersonalSignInfo,
+      [TransactionType.signTypedData]: () => {
+        const { version } =
+          (currentConfirmation as SignatureRequestType)?.msgParams ?? {};
+        if (version === 'V1') {
+          return TypedSignV1Info;
+        }
+        return TypedSignInfo;
+      },
+      [TransactionType.contractInteraction]: () => ContractInteractionInfo,
+    }),
+    [currentConfirmation],
+  );
+
   if (!currentConfirmation?.type) {
     return null;
   }
 
   const InfoComponent =
-    ConfirmationInfoConponentMap[currentConfirmation?.type as ConfirmationType];
+    ConfirmationInfoComponentMap[
+      currentConfirmation?.type as keyof typeof ConfirmationInfoComponentMap
+    ]();
 
   return <InfoComponent />;
-});
+};
 
 export default Info;
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
index 769b924cd9a8..2dd2520dcbf9 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
@@ -1,6 +1,79 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PersonalSignInfo does not render if required data is not present in the transaction 1`] = `<div />`;
+exports[`PersonalSignInfo handle reverse string properly 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Request from
+        </p>
+        <div>
+          <div
+            aria-describedby="tippy-tooltip-2"
+            class=""
+            data-original-title="This is the site asking for your signature."
+            data-tooltipped=""
+            style="display: flex;"
+            tabindex="0"
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              style="mask-image: url('./images/icons/question.svg');"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+        >
+          metamask.github.io
+        </p>
+      </div>
+    </div>
+  </div>
+  <div
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Message
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          Sign into \\u202E EVIL
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+`;
 
 exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
 <div>
@@ -29,7 +102,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
             tabindex="0"
           >
             <span
-              class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
               style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
@@ -41,7 +114,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
         >
-          https://metamask.github.io
+          metamask.github.io
         </p>
       </div>
     </div>
@@ -67,6 +140,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
         >
           Example \`personal_sign\` message
         </p>
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
index d64cfa71b371..577c5ee55eef 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
@@ -30,6 +30,29 @@ describe('PersonalSignInfo', () => {
     };
     const mockStore = configureMockStore([])(mockState);
     const { container } = renderWithProvider(<PersonalSignInfo />, mockStore);
+    expect(container).toMatchInlineSnapshot(`<div />`);
+  });
+
+  it('handle reverse string properly', () => {
+    const mockState = {
+      confirm: {
+        currentConfirmation: {
+          id: '0050d5b0-c023-11ee-a0cb-3390a510a0ab',
+          status: 'unapproved',
+          time: new Date().getTime(),
+          type: 'personal_sign',
+          securityProviderResponse: null,
+          msgParams: {
+            from: '0x8eeee1781fd885ff5ddef7789486676961873d12',
+            data: '0x5369676e20696e746f20e280ae204556494c',
+            origin: 'https://metamask.github.io',
+            siwe: { isSIWEMessage: false, parsedMessage: null },
+          },
+        },
+      },
+    };
+    const mockStore = configureMockStore([])(mockState);
+    const { container } = renderWithProvider(<PersonalSignInfo />, mockStore);
     expect(container).toMatchSnapshot();
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
index 14fb0d06ece5..5ad2c7d9fae7 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
@@ -13,11 +13,17 @@ import {
   BackgroundColor,
   BorderRadius,
 } from '../../../../../../helpers/constants/design-system';
-import { hexToText } from '../../../../../../helpers/utils/util';
+import {
+  hexToText,
+  sanitizeString,
+} from '../../../../../../helpers/utils/util';
+import { SignatureRequestType } from '../../../../types/confirm';
 
 const PersonalSignInfo: React.FC = () => {
   const t = useI18nContext();
-  const currentConfirmation = useSelector(currentConfirmationSelector);
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as SignatureRequestType;
 
   if (!currentConfirmation?.msgParams) {
     return null;
@@ -32,7 +38,7 @@ const PersonalSignInfo: React.FC = () => {
         marginBottom={4}
       >
         <ConfirmInfoRow label={t('requestFrom')} tooltip={t('requestFromInfo')}>
-          <ConfirmInfoRowUrl url={currentConfirmation?.msgParams?.origin} />
+          <ConfirmInfoRowUrl url={currentConfirmation.msgParams.origin} />
         </ConfirmInfoRow>
       </Box>
       <Box
@@ -43,7 +49,9 @@ const PersonalSignInfo: React.FC = () => {
       >
         <ConfirmInfoRow label={t('message')}>
           <ConfirmInfoRowText
-            text={hexToText(currentConfirmation.msgParams?.data)}
+            text={sanitizeString(
+              hexToText(currentConfirmation.msgParams?.data),
+            )}
           />
         </ConfirmInfoRow>
       </Box>
diff --git a/ui/pages/confirmations/components/confirm/info/shared/__snapshots__/transaction-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/__snapshots__/transaction-details.test.tsx.snap
new file mode 100644
index 000000000000..b2301cd400a1
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/shared/__snapshots__/transaction-details.test.tsx.snap
@@ -0,0 +1,132 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<TransactionDetails /> does not render component for transaction details 1`] = `<div />`;
+
+exports[`<TransactionDetails /> renders component for transaction details 1`] = `
+<div>
+  <div
+    class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+    style="overflow-wrap: anywhere; min-height: 24px;"
+  >
+    <div
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+    >
+      <p
+        class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+      >
+        Request from
+      </p>
+      <div>
+        <div
+          aria-describedby="tippy-tooltip-1"
+          class=""
+          data-original-title="This is the site asking for your confirmation."
+          data-tooltipped=""
+          style="display: flex;"
+          tabindex="0"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+            style="mask-image: url('./images/icons/question.svg');"
+          />
+        </div>
+      </div>
+    </div>
+    <div
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+    >
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      >
+        metamask.github.io
+      </p>
+    </div>
+  </div>
+  <div
+    class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+    style="overflow-wrap: anywhere; min-height: 24px;"
+  >
+    <div
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+    >
+      <p
+        class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+      >
+        Interacting with
+      </p>
+      <div>
+        <div
+          aria-describedby="tippy-tooltip-2"
+          class=""
+          data-original-title="This is the contract you're interacting with. Protect yourself from scammers by  verifying the details."
+          data-tooltipped=""
+          style="display: flex;"
+          tabindex="0"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+            style="mask-image: url('./images/icons/question.svg');"
+          />
+        </div>
+      </div>
+    </div>
+    <div
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        >
+          <div
+            class="mm-avatar-account__jazzicon"
+          >
+            <div
+              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 98);"
+            >
+              <svg
+                height="16"
+                width="16"
+                x="0"
+                y="0"
+              >
+                <rect
+                  fill="#018E82"
+                  height="16"
+                  transform="translate(0.09338133124744565 -0.04490608666778058) rotate(456.7 8 8)"
+                  width="16"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#FB187B"
+                  height="16"
+                  transform="translate(-6.3240369287990985 -1.0053822898747908) rotate(305.5 8 8)"
+                  width="16"
+                  x="0"
+                  y="0"
+                />
+                <rect
+                  fill="#237CE1"
+                  height="16"
+                  transform="translate(4.0809955633515935 -14.427164334848008) rotate(395.8 8 8)"
+                  width="16"
+                  x="0"
+                  y="0"
+                />
+              </svg>
+            </div>
+          </div>
+        </div>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+          data-testid="confirm-info-row-display-name"
+        >
+          0x88AA6...A5125
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details.stories.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-details.stories.tsx
new file mode 100644
index 000000000000..200f67ba65ef
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details.stories.tsx
@@ -0,0 +1,30 @@
+import { Meta } from '@storybook/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../../test/data/confirmations/contract-interaction';
+import mockState from '../../../../../../../test/data/mock-state.json';
+import configureStore from '../../../../../../store/store';
+import { TransactionDetails } from './transaction-details';
+
+const store = configureStore({
+  metamask: { ...mockState.metamask },
+  confirm: {
+    currentConfirmation: genUnapprovedContractInteractionConfirmation(),
+  },
+});
+
+const Story = {
+  title: 'Components/App/Confirm/info/TransactionDetails',
+  component: TransactionDetails,
+  decorators: [
+    (story: () => Meta<typeof TransactionDetails>) => (
+      <Provider store={store}>{story()}</Provider>
+    ),
+  ],
+};
+
+export default Story;
+
+export const DefaultStory = () => <TransactionDetails />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details.test.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-details.test.tsx
new file mode 100644
index 000000000000..38173d207b07
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details.test.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../../test/data/confirmations/contract-interaction';
+import mockState from '../../../../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../../../../test/lib/render-helpers';
+import { TransactionDetails } from './transaction-details';
+
+describe('<TransactionDetails />', () => {
+  const middleware = [thunk];
+
+  it('does not render component for transaction details', () => {
+    const state = { ...mockState, confirm: { currentConfirmation: null } };
+    const mockStore = configureMockStore(middleware)(state);
+    const { container } = renderWithProvider(<TransactionDetails />, mockStore);
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders component for transaction details', () => {
+    const state = {
+      ...mockState,
+      confirm: {
+        currentConfirmation: genUnapprovedContractInteractionConfirmation(),
+      },
+    };
+    const mockStore = configureMockStore(middleware)(state);
+    const { container } = renderWithProvider(<TransactionDetails />, mockStore);
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-details.tsx
new file mode 100644
index 000000000000..b135f0dc3008
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details.tsx
@@ -0,0 +1,94 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { isValidAddress } from 'ethereumjs-util';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import {
+  ConfirmInfoRow,
+  ConfirmInfoRowAddress,
+  ConfirmInfoRowText,
+  ConfirmInfoRowUrl,
+} from '../../../../../../components/app/confirm/info/row';
+import { useI18nContext } from '../../../../../../hooks/useI18nContext';
+import { currentConfirmationSelector } from '../../../../selectors';
+import { useKnownMethodDataInTransaction } from '../hooks/known-method-data-in-transaction';
+
+const OriginRow = () => {
+  const t = useI18nContext();
+
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as TransactionMeta;
+
+  const origin = currentConfirmation?.origin;
+
+  if (!origin) {
+    return null;
+  }
+
+  return (
+    <ConfirmInfoRow
+      label={t('requestFrom')}
+      tooltip={t('requestFromTransactionDescription')}
+    >
+      <ConfirmInfoRowUrl url={origin} />
+    </ConfirmInfoRow>
+  );
+};
+
+const RecipientRow = () => {
+  const t = useI18nContext();
+
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as TransactionMeta;
+
+  if (
+    !currentConfirmation?.txParams?.to ||
+    !isValidAddress(currentConfirmation?.txParams?.to ?? '')
+  ) {
+    return null;
+  }
+
+  return (
+    <ConfirmInfoRow
+      label={t('interactingWith')}
+      tooltip={t('interactingWithTransactionDescription')}
+    >
+      <ConfirmInfoRowAddress address={currentConfirmation.txParams.to} />
+    </ConfirmInfoRow>
+  );
+};
+
+const MethodDataRow = () => {
+  const t = useI18nContext();
+
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as TransactionMeta;
+
+  const { knownMethodData } =
+    useKnownMethodDataInTransaction(currentConfirmation);
+
+  if (!knownMethodData?.name) {
+    return null;
+  }
+
+  return (
+    <ConfirmInfoRow
+      label={t('methodData')}
+      tooltip={t('methodDataTransactionDescription')}
+    >
+      <ConfirmInfoRowText text={knownMethodData.name} />
+    </ConfirmInfoRow>
+  );
+};
+
+export const TransactionDetails = () => {
+  return (
+    <>
+      <OriginRow />
+      <RecipientRow />
+      <MethodDataRow />
+    </>
+  );
+};
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
new file mode 100644
index 000000000000..028f709f083c
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
@@ -0,0 +1,127 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Request from
+        </p>
+        <div>
+          <div
+            aria-describedby="tippy-tooltip-1"
+            class=""
+            data-original-title="This is the site asking for your signature."
+            data-tooltipped=""
+            style="display: flex;"
+            tabindex="0"
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              style="mask-image: url('./images/icons/question.svg');"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+        >
+          metamask.github.io
+        </p>
+      </div>
+    </div>
+  </div>
+  <div
+    class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Message
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--width-full"
+      >
+        <div
+          class="mm-box"
+          style="margin-left: -8px;"
+        >
+          <div
+            class="mm-box mm-box--width-full"
+          >
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  Message:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
+                >
+                  Hi, Alice!
+                </p>
+              </div>
+            </div>
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  A number:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
+                >
+                  1337
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.stories.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.stories.tsx
new file mode 100644
index 000000000000..b1eaa95424d2
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.stories.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+
+import { unapprovedTypedSignMsgV1 } from '../../../../../../../test/data/confirmations/typed_sign';
+
+import mockState from '../../../../../../../test/data/mock-state.json';
+import configureStore from '../../../../../../store/store';
+
+import TypedSignInfoV1 from './typed-sign-v1';
+
+const store = configureStore({
+  metamask: {
+    ...mockState.metamask,
+  },
+  confirm: {
+    currentConfirmation: unapprovedTypedSignMsgV1,
+  },
+});
+
+const Story = {
+  title: 'Components/App/Confirm/info/TypedSignInfoV1',
+  component: TypedSignInfoV1,
+  decorators: [
+    (story: () => any) => <Provider store={store}>{story()}</Provider>,
+  ],
+};
+
+export default Story;
+
+export const DefaultStory = () => <TypedSignInfoV1 />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
new file mode 100644
index 000000000000..0883d16c253b
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+
+import { renderWithProvider } from '../../../../../../../test/lib/render-helpers';
+import { unapprovedTypedSignMsgV1 } from '../../../../../../../test/data/confirmations/typed_sign';
+import TypedSignInfoV1 from './typed-sign-v1';
+
+describe('TypedSignInfo', () => {
+  it('correctly renders typed sign data request', () => {
+    const mockState = {
+      confirm: {
+        currentConfirmation: unapprovedTypedSignMsgV1,
+      },
+    };
+    const mockStore = configureMockStore([])(mockState);
+    const { container } = renderWithProvider(<TypedSignInfoV1 />, mockStore);
+    expect(container).toMatchSnapshot();
+  });
+
+  it('does not render if required data is not present in the transaction', () => {
+    const mockState = {
+      confirm: {
+        currentConfirmation: {
+          id: '0050d5b0-c023-11ee-a0cb-3390a510a0ab',
+          status: 'unapproved',
+          time: new Date().getTime(),
+          type: 'json_request',
+        },
+      },
+    };
+    const mockStore = configureMockStore([])(mockState);
+    const { container } = renderWithProvider(<TypedSignInfoV1 />, mockStore);
+    expect(container).toMatchInlineSnapshot(`<div />`);
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
new file mode 100644
index 000000000000..a9b776daa529
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import {
+  ConfirmInfoRow,
+  ConfirmInfoRowUrl,
+} from '../../../../../../components/app/confirm/info/row';
+import { useI18nContext } from '../../../../../../hooks/useI18nContext';
+import { currentConfirmationSelector } from '../../../../../../selectors';
+import { Box } from '../../../../../../components/component-library';
+import {
+  BackgroundColor,
+  BorderRadius,
+} from '../../../../../../helpers/constants/design-system';
+import {
+  SignatureRequestType,
+  TypedSignDataV1Type,
+} from '../../../../types/confirm';
+import { ConfirmInfoRowTypedSignDataV1 } from '../../row/typed-sign-data-v1/typedSignDataV1';
+
+const TypedSignV1Info: React.FC = () => {
+  const t = useI18nContext();
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as SignatureRequestType;
+
+  if (!currentConfirmation?.msgParams) {
+    return null;
+  }
+
+  return (
+    <>
+      <Box
+        backgroundColor={BackgroundColor.backgroundDefault}
+        borderRadius={BorderRadius.MD}
+        padding={2}
+        marginBottom={4}
+      >
+        <ConfirmInfoRow label={t('requestFrom')} tooltip={t('requestFromInfo')}>
+          <ConfirmInfoRowUrl url={currentConfirmation.msgParams.origin} />
+        </ConfirmInfoRow>
+      </Box>
+      <Box
+        backgroundColor={BackgroundColor.backgroundDefault}
+        borderRadius={BorderRadius.MD}
+        padding={2}
+        marginBottom={4}
+      >
+        <ConfirmInfoRow label={t('message')}>
+          <ConfirmInfoRowTypedSignDataV1
+            data={currentConfirmation.msgParams?.data as TypedSignDataV1Type}
+          />
+        </ConfirmInfoRow>
+      </Box>
+    </>
+  );
+};
+
+export default TypedSignV1Info;
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index c90b16fae093..cf3c57f86829 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -29,7 +29,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
             tabindex="0"
           >
             <span
-              class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
               style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
@@ -41,7 +41,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
         >
-          https://metamask.github.io
+          metamask.github.io
         </p>
       </div>
     </div>
@@ -135,11 +135,10 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
       </div>
       <div
         class="mm-box mm-box--width-full"
-        style="margin: 0px -8px;"
       >
         <div
           class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-          style="overflow-wrap: anywhere; min-height: 24px;"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -155,6 +154,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
             >
               Mail
             </p>
@@ -162,210 +162,240 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
         </div>
         <div
           class="mm-box"
-          style="margin: 0px -8px;"
+          style="margin-left: -8px;"
         >
           <div
-            class="mm-box mm-box--margin-left-2"
+            class="mm-box mm-box--width-full"
           >
             <div
-              class="mm-box mm-box--margin-left-2"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Name:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  >
-                    Cow
-                  </p>
-                </div>
+                  From:
+                </p>
               </div>
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--width-full"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Name:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
                   >
-                    Wallet:
-                  </p>
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Cow
+                    </p>
+                  </div>
                 </div>
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Wallet:
+                    </p>
+                  </div>
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
+                          class="mm-avatar-account__jazzicon"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
                           >
-                            <rect
-                              fill="#FA7900"
-                              height="16"
-                              transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#034F5E"
-                              height="16"
-                              transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#FB185C"
+                            <svg
                               height="16"
-                              transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
                               width="16"
                               x="0"
                               y="0"
-                            />
-                          </svg>
+                            >
+                              <rect
+                                fill="#FA7900"
+                                height="16"
+                                transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#034F5E"
+                                height="16"
+                                transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#FB185C"
+                                height="16"
+                                transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xCD2a3...DD826
+                      </p>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xCD2a3...DD826
-                    </p>
                   </div>
                 </div>
               </div>
             </div>
             <div
-              class="mm-box mm-box--margin-left-2"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Name:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  >
-                    Bob
-                  </p>
-                </div>
+                  To:
+                </p>
               </div>
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--width-full"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Name:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
                   >
-                    Wallet:
-                  </p>
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Bob
+                    </p>
+                  </div>
                 </div>
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Wallet:
+                    </p>
+                  </div>
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                          class="mm-avatar-account__jazzicon"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
                           >
-                            <rect
-                              fill="#C8144A"
-                              height="16"
-                              transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#01878E"
-                              height="16"
-                              transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#1897F2"
+                            <svg
                               height="16"
-                              transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
                               width="16"
                               x="0"
                               y="0"
-                            />
-                          </svg>
+                            >
+                              <rect
+                                fill="#C8144A"
+                                height="16"
+                                transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#01878E"
+                                height="16"
+                                transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#1897F2"
+                                height="16"
+                                transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xbBbBB...bBBbB
+                      </p>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xbBbBB...bBBbB
-                    </p>
                   </div>
                 </div>
               </div>
             </div>
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -381,6 +411,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
                 >
                   Hello, Bob!
                 </p>
@@ -421,7 +452,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
             tabindex="0"
           >
             <span
-              class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
               style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
@@ -433,7 +464,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
         >
-          https://metamask.github.io
+          metamask.github.io
         </p>
       </div>
     </div>
@@ -527,11 +558,10 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
       </div>
       <div
         class="mm-box mm-box--width-full"
-        style="margin: 0px -8px;"
       >
         <div
           class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-          style="overflow-wrap: anywhere; min-height: 24px;"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -547,6 +577,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
             >
               Mail
             </p>
@@ -554,210 +585,240 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
         </div>
         <div
           class="mm-box"
-          style="margin: 0px -8px;"
+          style="margin-left: -8px;"
         >
           <div
-            class="mm-box mm-box--margin-left-2"
+            class="mm-box mm-box--width-full"
           >
             <div
-              class="mm-box mm-box--margin-left-2"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Name:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  >
-                    Cow
-                  </p>
-                </div>
+                  From:
+                </p>
               </div>
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--width-full"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Wallet:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                   >
-                    <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
-                    >
-                      <div
-                        class="mm-avatar-account__jazzicon"
-                      >
-                        <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
-                        >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
-                          >
-                            <rect
-                              fill="#FA7900"
-                              height="16"
-                              transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#034F5E"
-                              height="16"
-                              transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#FB185C"
-                              height="16"
-                              transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                          </svg>
-                        </div>
-                      </div>
-                    </div>
                     <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                     >
-                      0xCD2a3...DD826
+                      Name:
                     </p>
                   </div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="mm-box mm-box--margin-left-2"
-            >
-              <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Name:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
                   >
-                    Bob
-                  </p>
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Cow
+                    </p>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
-              >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                   >
-                    Wallet:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Wallet:
+                    </p>
+                  </div>
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                          class="mm-avatar-account__jazzicon"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
                           >
-                            <rect
-                              fill="#C8144A"
-                              height="16"
-                              transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#01878E"
+                            <svg
                               height="16"
-                              transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
                               width="16"
                               x="0"
                               y="0"
-                            />
-                            <rect
-                              fill="#1897F2"
+                            >
+                              <rect
+                                fill="#FA7900"
+                                height="16"
+                                transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#034F5E"
+                                height="16"
+                                transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#FB185C"
+                                height="16"
+                                transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xCD2a3...DD826
+                      </p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  To:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--width-full"
+              >
+                <div
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Name:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Bob
+                    </p>
+                  </div>
+                </div>
+                <div
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Wallet:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  >
+                    <div
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    >
+                      <div
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      >
+                        <div
+                          class="mm-avatar-account__jazzicon"
+                        >
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                          >
+                            <svg
                               height="16"
-                              transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
                               width="16"
                               x="0"
                               y="0"
-                            />
-                          </svg>
+                            >
+                              <rect
+                                fill="#C8144A"
+                                height="16"
+                                transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#01878E"
+                                height="16"
+                                transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#1897F2"
+                                height="16"
+                                transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xbBbBB...bBBbB
+                      </p>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xbBbBB...bBBbB
-                    </p>
                   </div>
                 </div>
               </div>
             </div>
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -773,6 +834,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
                 >
                   Hello, Bob!
                 </p>
@@ -813,7 +875,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
             tabindex="0"
           >
             <span
-              class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
               style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
@@ -825,7 +887,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
         >
-          https://metamask.github.io
+          metamask.github.io
         </p>
       </div>
     </div>
@@ -919,11 +981,10 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
       </div>
       <div
         class="mm-box mm-box--width-full"
-        style="margin: 0px -8px;"
       >
         <div
           class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-          style="overflow-wrap: anywhere; min-height: 24px;"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -939,6 +1000,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
             >
               Mail
             </p>
@@ -946,14 +1008,14 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
         </div>
         <div
           class="mm-box"
-          style="margin: 0px -8px;"
+          style="margin-left: -8px;"
         >
           <div
-            class="mm-box mm-box--margin-left-2"
+            class="mm-box mm-box--width-full"
           >
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -969,43 +1031,31 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
                 >
                   Hello, Bob!
                 </p>
               </div>
             </div>
             <div
-              class="mm-box mm-box--margin-left-2"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Name:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  >
-                    Cow
-                  </p>
-                </div>
+                  From:
+                </p>
               </div>
               <div
-                class="mm-box mm-box--margin-left-2"
+                class="mm-box mm-box--width-full"
               >
                 <div
                   class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -1013,70 +1063,23 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                     >
-                      0:
+                      Name:
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
                   >
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
                     >
-                      <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
-                      >
-                        <div
-                          class="mm-avatar-account__jazzicon"
-                        >
-                          <div
-                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
-                          >
-                            <svg
-                              height="16"
-                              width="16"
-                              x="0"
-                              y="0"
-                            >
-                              <rect
-                                fill="#FA7900"
-                                height="16"
-                                transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#034F5E"
-                                height="16"
-                                transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#FB185C"
-                                height="16"
-                                transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                      <p
-                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                        data-testid="confirm-info-row-display-name"
-                      >
-                        0xCD2a3...DD826
-                      </p>
-                    </div>
+                      Cow
+                    </p>
                   </div>
                 </div>
                 <div
                   class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -1084,149 +1087,248 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                     >
-                      1:
+                      Wallets:
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    class="mm-box mm-box--width-full"
                   >
                     <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          0:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                           >
-                            <svg
-                              height="16"
-                              width="16"
-                              x="0"
-                              y="0"
+                            <div
+                              class="mm-avatar-account__jazzicon"
                             >
-                              <rect
-                                fill="#F91E01"
-                                height="16"
-                                transform="translate(-3.031601448459508 1.44638157917772) rotate(179.5 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#FA5300"
-                                height="16"
-                                transform="translate(0.001001577275992914 -7.592133809870717) rotate(370.7 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#F5A300"
-                                height="16"
-                                transform="translate(-9.667744843805323 10.267175012988094) rotate(298.9 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                            </svg>
+                              <div
+                                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
+                              >
+                                <svg
+                                  height="16"
+                                  width="16"
+                                  x="0"
+                                  y="0"
+                                >
+                                  <rect
+                                    fill="#FA7900"
+                                    height="16"
+                                    transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#034F5E"
+                                    height="16"
+                                    transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#FB185C"
+                                    height="16"
+                                    transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
+                          <p
+                            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                            data-testid="confirm-info-row-display-name"
+                          >
+                            0xCD2a3...DD826
+                          </p>
                         </div>
                       </div>
-                      <p
-                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                        data-testid="confirm-info-row-display-name"
-                      >
-                        0xDeaDb...DbeeF
-                      </p>
                     </div>
-                  </div>
-                </div>
-                <div
-                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
-                >
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                  >
-                    <p
-                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                    >
-                      2:
-                    </p>
-                  </div>
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                  >
                     <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          1:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                           >
-                            <svg
-                              height="16"
-                              width="16"
-                              x="0"
-                              y="0"
+                            <div
+                              class="mm-avatar-account__jazzicon"
                             >
-                              <rect
-                                fill="#FA3E00"
-                                height="16"
-                                transform="translate(2.1189727229825075 3.7201589705667972) rotate(163.6 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#018E74"
-                                height="16"
-                                transform="translate(-3.5064720430845115 9.598091001429925) rotate(205.4 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#238FE1"
-                                height="16"
-                                transform="translate(-5.001213401730692 12.04822844354251) rotate(286.5 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                            </svg>
+                              <div
+                                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
+                              >
+                                <svg
+                                  height="16"
+                                  width="16"
+                                  x="0"
+                                  y="0"
+                                >
+                                  <rect
+                                    fill="#F91E01"
+                                    height="16"
+                                    transform="translate(-3.031601448459508 1.44638157917772) rotate(179.5 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#FA5300"
+                                    height="16"
+                                    transform="translate(0.001001577275992914 -7.592133809870717) rotate(370.7 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#F5A300"
+                                    height="16"
+                                    transform="translate(-9.667744843805323 10.267175012988094) rotate(298.9 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
+                          <p
+                            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                            data-testid="confirm-info-row-display-name"
+                          >
+                            0xDeaDb...DbeeF
+                          </p>
                         </div>
                       </div>
-                      <p
-                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                        data-testid="confirm-info-row-display-name"
+                    </div>
+                    <div
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                    >
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                       >
-                        0x06195...43896
-                      </p>
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          2:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                      >
+                        <div
+                          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                        >
+                          <div
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                          >
+                            <div
+                              class="mm-avatar-account__jazzicon"
+                            >
+                              <div
+                                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
+                              >
+                                <svg
+                                  height="16"
+                                  width="16"
+                                  x="0"
+                                  y="0"
+                                >
+                                  <rect
+                                    fill="#FA3E00"
+                                    height="16"
+                                    transform="translate(2.1189727229825075 3.7201589705667972) rotate(163.6 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#018E74"
+                                    height="16"
+                                    transform="translate(-3.5064720430845115 9.598091001429925) rotate(205.4 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#238FE1"
+                                    height="16"
+                                    transform="translate(-5.001213401730692 12.04822844354251) rotate(286.5 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                          <p
+                            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                            data-testid="confirm-info-row-display-name"
+                          >
+                            0x06195...43896
+                          </p>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
             <div
-              class="mm-box mm-box--margin-left-2"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--margin-left-2"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  To:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--width-full"
               >
                 <div
                   class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -1234,232 +1336,265 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                     >
-                      Name:
-                    </p>
-                  </div>
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
-                  >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                    >
-                      Bob
+                      0:
                     </p>
                   </div>
-                </div>
-                <div
-                  class="mm-box mm-box--margin-left-2"
-                >
                   <div
-                    class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                    style="overflow-wrap: anywhere; min-height: 24px;"
+                    class="mm-box mm-box--width-full"
                   >
                     <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
-                      <p
-                        class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                       >
-                        0:
-                      </p>
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          Name:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                          style="white-space: pre-wrap;"
+                        >
+                          Bob
+                        </p>
+                      </div>
                     </div>
                     <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          Wallets:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--width-full"
                       >
                         <div
-                          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-avatar-account__jazzicon"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                            >
+                              0:
+                            </p>
+                          </div>
+                          <div
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                           >
                             <div
-                              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
-                              <svg
-                                height="16"
-                                width="16"
-                                x="0"
-                                y="0"
+                              <div
+                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                               >
-                                <rect
-                                  fill="#C8144A"
-                                  height="16"
-                                  transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                                <rect
-                                  fill="#01878E"
-                                  height="16"
-                                  transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                                <rect
-                                  fill="#1897F2"
-                                  height="16"
-                                  transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                              </svg>
+                                <div
+                                  class="mm-avatar-account__jazzicon"
+                                >
+                                  <div
+                                    style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                                  >
+                                    <svg
+                                      height="16"
+                                      width="16"
+                                      x="0"
+                                      y="0"
+                                    >
+                                      <rect
+                                        fill="#C8144A"
+                                        height="16"
+                                        transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                      <rect
+                                        fill="#01878E"
+                                        height="16"
+                                        transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                      <rect
+                                        fill="#1897F2"
+                                        height="16"
+                                        transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                    </svg>
+                                  </div>
+                                </div>
+                              </div>
+                              <p
+                                class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                                data-testid="confirm-info-row-display-name"
+                              >
+                                0xbBbBB...bBBbB
+                              </p>
                             </div>
                           </div>
                         </div>
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                          data-testid="confirm-info-row-display-name"
-                        >
-                          0xbBbBB...bBBbB
-                        </p>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                    style="overflow-wrap: anywhere; min-height: 24px;"
-                  >
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                    >
-                      <p
-                        class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                      >
-                        1:
-                      </p>
-                    </div>
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                    >
-                      <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                      >
                         <div
-                          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-avatar-account__jazzicon"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                            >
+                              1:
+                            </p>
+                          </div>
+                          <div
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                           >
                             <div
-                              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
+                              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
-                              <svg
-                                height="16"
-                                width="16"
-                                x="0"
-                                y="0"
+                              <div
+                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                               >
-                                <rect
-                                  fill="#2395E1"
-                                  height="16"
-                                  transform="translate(-1.7353143855136905 0.5115867848025443) rotate(191.9 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                                <rect
-                                  fill="#F90101"
-                                  height="16"
-                                  transform="translate(1.7169232764557802 -9.276715881533601) rotate(319.8 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                                <rect
-                                  fill="#F58700"
-                                  height="16"
-                                  transform="translate(9.91414735179574 5.139720751783702) rotate(180.7 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                              </svg>
+                                <div
+                                  class="mm-avatar-account__jazzicon"
+                                >
+                                  <div
+                                    style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
+                                  >
+                                    <svg
+                                      height="16"
+                                      width="16"
+                                      x="0"
+                                      y="0"
+                                    >
+                                      <rect
+                                        fill="#2395E1"
+                                        height="16"
+                                        transform="translate(-1.7353143855136905 0.5115867848025443) rotate(191.9 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                      <rect
+                                        fill="#F90101"
+                                        height="16"
+                                        transform="translate(1.7169232764557802 -9.276715881533601) rotate(319.8 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                      <rect
+                                        fill="#F58700"
+                                        height="16"
+                                        transform="translate(9.91414735179574 5.139720751783702) rotate(180.7 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                    </svg>
+                                  </div>
+                                </div>
+                              </div>
+                              <p
+                                class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                                data-testid="confirm-info-row-display-name"
+                              >
+                                0xB0Bda...bEa57
+                              </p>
                             </div>
                           </div>
                         </div>
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                          data-testid="confirm-info-row-display-name"
-                        >
-                          0xB0Bda...bEa57
-                        </p>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                    style="overflow-wrap: anywhere; min-height: 24px;"
-                  >
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                    >
-                      <p
-                        class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                      >
-                        2:
-                      </p>
-                    </div>
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                    >
-                      <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                      >
                         <div
-                          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-avatar-account__jazzicon"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                            >
+                              2:
+                            </p>
+                          </div>
+                          <div
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                           >
                             <div
-                              style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
+                              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
-                              <svg
-                                height="16"
-                                width="16"
-                                x="0"
-                                y="0"
+                              <div
+                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                               >
-                                <rect
-                                  fill="#018E8C"
-                                  height="16"
-                                  transform="translate(3.988074950687866 0.3554940504644344) rotate(177.8 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                                <rect
-                                  fill="#F29202"
-                                  height="16"
-                                  transform="translate(-7.220928666254465 -2.4813555582770794) rotate(334.6 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                                <rect
-                                  fill="#236FE1"
-                                  height="16"
-                                  transform="translate(14.621768557060026 -6.282465882779628) rotate(456.1 8 8)"
-                                  width="16"
-                                  x="0"
-                                  y="0"
-                                />
-                              </svg>
+                                <div
+                                  class="mm-avatar-account__jazzicon"
+                                >
+                                  <div
+                                    style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
+                                  >
+                                    <svg
+                                      height="16"
+                                      width="16"
+                                      x="0"
+                                      y="0"
+                                    >
+                                      <rect
+                                        fill="#018E8C"
+                                        height="16"
+                                        transform="translate(3.988074950687866 0.3554940504644344) rotate(177.8 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                      <rect
+                                        fill="#F29202"
+                                        height="16"
+                                        transform="translate(-7.220928666254465 -2.4813555582770794) rotate(334.6 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                      <rect
+                                        fill="#236FE1"
+                                        height="16"
+                                        transform="translate(14.621768557060026 -6.282465882779628) rotate(456.1 8 8)"
+                                        width="16"
+                                        x="0"
+                                        y="0"
+                                      />
+                                    </svg>
+                                  </div>
+                                </div>
+                              </div>
+                              <p
+                                class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                                data-testid="confirm-info-row-display-name"
+                              >
+                                0xB0B0b...00000
+                              </p>
                             </div>
                           </div>
                         </div>
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                          data-testid="confirm-info-row-display-name"
-                        >
-                          0xB0B0b...00000
-                        </p>
                       </div>
                     </div>
                   </div>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
index ee824d6c6652..b36ddf132f13 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
@@ -15,16 +15,21 @@ import {
   BorderRadius,
 } from '../../../../../../helpers/constants/design-system';
 import { ConfirmInfoRowTypedSignData } from '../../row/typed-sign-data/typedSignData';
+import { SignatureRequestType } from '../../../../types/confirm';
 
 const TypedSignInfo: React.FC = () => {
   const t = useI18nContext();
-  const currentConfirmation = useSelector(currentConfirmationSelector);
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as SignatureRequestType;
 
   if (!currentConfirmation?.msgParams) {
     return null;
   }
 
-  const { domain = {} } = JSON.parse(currentConfirmation?.msgParams?.data);
+  const { domain = {} } = JSON.parse(
+    currentConfirmation.msgParams.data as string,
+  );
 
   return (
     <>
@@ -35,7 +40,7 @@ const TypedSignInfo: React.FC = () => {
         marginBottom={4}
       >
         <ConfirmInfoRow label={t('requestFrom')} tooltip={t('requestFromInfo')}>
-          <ConfirmInfoRowUrl url={currentConfirmation?.msgParams?.origin} />
+          <ConfirmInfoRowUrl url={currentConfirmation.msgParams.origin} />
         </ConfirmInfoRow>
         {isValidAddress(domain.verifyingContract) && (
           <ConfirmInfoRow label={t('interactingWith')}>
@@ -51,7 +56,7 @@ const TypedSignInfo: React.FC = () => {
       >
         <ConfirmInfoRow label={t('message')}>
           <ConfirmInfoRowTypedSignData
-            data={currentConfirmation.msgParams?.data}
+            data={currentConfirmation.msgParams?.data as string}
           />
         </ConfirmInfoRow>
       </Box>
diff --git a/ui/pages/confirmations/components/confirm/ledger-info/__snapshots__/ledger-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/ledger-info/__snapshots__/ledger-info.test.tsx.snap
new file mode 100644
index 000000000000..1a810bdaf5f1
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/ledger-info/__snapshots__/ledger-info.test.tsx.snap
@@ -0,0 +1,42 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LedgerInfo renders correctly if account is ledger account 1`] = `
+<div>
+  <div
+    class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-info mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-primary-muted mm-box--rounded-sm"
+    style="margin-top: 16px;"
+  >
+    <span
+      class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-primary-default"
+      style="mask-image: url('./images/icons/info.svg');"
+    />
+    <div
+      class="mm-box mm-box--min-width-0"
+    >
+      <h4
+        class="mm-box mm-text mm-text--heading-sm mm-text--font-weight-medium mm-box--color-text-default"
+      >
+        Prior to clicking confirm:
+      </h4>
+      <ul
+        style="list-style: disc;"
+      >
+        <li>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            Be sure your Ledger is plugged in and to select the Ethereum app.
+          </p>
+        </li>
+        <li>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            Enable "smart contract data" or "blind signing" on your Ledger device.
+          </p>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/ledger-info/index.ts b/ui/pages/confirmations/components/confirm/ledger-info/index.ts
new file mode 100644
index 000000000000..b3538e79c9b4
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/ledger-info/index.ts
@@ -0,0 +1 @@
+export { default as LedgerInfo } from './ledger-info';
diff --git a/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.stories.tsx b/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.stories.tsx
new file mode 100644
index 000000000000..fba409ec318d
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.stories.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+
+import mockState from '../../../../../../test/data/mock-state.json';
+import configureStore from '../../../../../store/store';
+
+import {
+  LedgerTransportTypes,
+  WebHIDConnectedStatuses,
+} from '../../../../../../shared/constants/hardware-wallets';
+import { unapprovedPersonalSignMsg } from '../../../../../../test/data/confirmations/personal_sign';
+
+import LedgerInfo from './ledger-info';
+
+const store = configureStore({
+  ...mockState,
+  metamask: {
+    ...mockState.metamask,
+    ledgerTransportType: LedgerTransportTypes.webhid,
+  },
+  confirm: {
+    currentConfirmation: {
+      ...unapprovedPersonalSignMsg,
+      msgParams: {
+        ...unapprovedPersonalSignMsg.msgParams,
+        from: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
+      },
+    },
+  },
+  appState: {
+    ...mockState.appState,
+    ledgerWebHidConnectedStatus: WebHIDConnectedStatuses.notConnected,
+  },
+});
+
+const Story = {
+  title: 'Confirmations/Components/Confirm/LedgerInfo',
+  component: LedgerInfo,
+  decorators: [(story: any) => <Provider store={store}>{story()}</Provider>],
+};
+
+export default Story;
+
+export const DefaultStory = () => <LedgerInfo />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.test.tsx b/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.test.tsx
new file mode 100644
index 000000000000..1d7712efab52
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.test.tsx
@@ -0,0 +1,98 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+
+import {
+  HardwareTransportStates,
+  LedgerTransportTypes,
+  WebHIDConnectedStatuses,
+} from '../../../../../../shared/constants/hardware-wallets';
+import { unapprovedPersonalSignMsg } from '../../../../../../test/data/confirmations/personal_sign';
+import mockState from '../../../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
+import LedgerInfo from './ledger-info';
+
+describe('LedgerInfo', () => {
+  it('renders correctly if account is ledger account', () => {
+    const state = {
+      ...mockState,
+      confirm: {
+        currentConfirmation: {
+          ...unapprovedPersonalSignMsg,
+          msgParams: {
+            ...unapprovedPersonalSignMsg.msgParams,
+            from: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
+          },
+        },
+      },
+    };
+    const mockStore = configureMockStore([])(state);
+    const { container } = renderWithProvider(<LedgerInfo />, mockStore);
+    expect(container).toMatchSnapshot();
+  });
+
+  it('return null for non-ledger account', () => {
+    const state = {
+      ...mockState,
+      confirm: {
+        currentConfirmation: unapprovedPersonalSignMsg,
+      },
+    };
+    const mockStore = configureMockStore([])(state);
+    const { container } = renderWithProvider(<LedgerInfo />, mockStore);
+    expect(container).toMatchInlineSnapshot(`<div />`);
+  });
+
+  it('display button to close other apps and reload if ledger device opening fails', () => {
+    const state = {
+      ...mockState,
+      confirm: {
+        currentConfirmation: {
+          ...unapprovedPersonalSignMsg,
+          msgParams: {
+            ...unapprovedPersonalSignMsg.msgParams,
+            from: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
+          },
+        },
+      },
+      appState: {
+        ...mockState.appState,
+        ledgerTransportStatus: HardwareTransportStates.deviceOpenFailure,
+      },
+    };
+    const mockStore = configureMockStore([])(state);
+    const { getByText } = renderWithProvider(<LedgerInfo />, mockStore);
+    expect(
+      getByText(
+        'Close any other software connected to your device and then click here to refresh.',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('display button to connect ledger if not already connected', () => {
+    const state = {
+      ...mockState,
+      metamask: {
+        ...mockState.metamask,
+        ledgerTransportType: LedgerTransportTypes.webhid,
+      },
+      confirm: {
+        currentConfirmation: {
+          ...unapprovedPersonalSignMsg,
+          msgParams: {
+            ...unapprovedPersonalSignMsg.msgParams,
+            from: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
+          },
+        },
+      },
+      appState: {
+        ...mockState.appState,
+        ledgerWebHidConnectedStatus: WebHIDConnectedStatuses.notConnected,
+      },
+    };
+    const mockStore = configureMockStore([])(state);
+    const { getByText } = renderWithProvider(<LedgerInfo />, mockStore);
+    expect(
+      getByText('Go to full screen to connect your Ledger.'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.tsx b/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.tsx
new file mode 100644
index 000000000000..0f250a9b0a47
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/ledger-info/ledger-info.tsx
@@ -0,0 +1,120 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { getEnvironmentType } from '../../../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../../shared/constants/app';
+import {
+  HardwareTransportStates,
+  LEDGER_USB_VENDOR_ID,
+  LedgerTransportTypes,
+  WebHIDConnectedStatuses,
+} from '../../../../../../shared/constants/hardware-wallets';
+import {
+  BannerAlert,
+  BannerAlertSeverity,
+  Button,
+  ButtonVariant,
+  Text,
+} from '../../../../../components/component-library';
+import {
+  getLedgerTransportStatus,
+  getLedgerWebHidConnectedStatus,
+  setLedgerWebHidConnectedStatus,
+} from '../../../../../ducks/app/app';
+import { getLedgerTransportType } from '../../../../../ducks/metamask/metamask';
+import {
+  FontWeight,
+  TextAlign,
+  TextVariant,
+} from '../../../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import useLedgerConnection from '../../../hooks/useLedgerConnection';
+
+const LedgerInfo: React.FC = () => {
+  const { isLedgerWallet } = useLedgerConnection();
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+
+  const webHidConnectedStatus = useSelector(getLedgerWebHidConnectedStatus);
+  const ledgerTransportType = useSelector(getLedgerTransportType);
+  const transportStatus = useSelector(getLedgerTransportStatus);
+  const environmentType = getEnvironmentType();
+  const environmentTypeIsFullScreen =
+    environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
+
+  if (!isLedgerWallet) {
+    return null;
+  }
+
+  const usingWebHID = ledgerTransportType === LedgerTransportTypes.webhid;
+
+  return (
+    <BannerAlert severity={BannerAlertSeverity.Info} style={{ marginTop: 16 }}>
+      <Text variant={TextVariant.headingSm} fontWeight={FontWeight.Medium}>
+        {t('ledgerConnectionInstructionHeader')}
+      </Text>
+      <ul style={{ listStyle: 'disc' }}>
+        <li>
+          <Text variant={TextVariant.bodyMd}>
+            {t('ledgerConnectionInstructionStepThree')}
+          </Text>
+        </li>
+        <li>
+          <Text variant={TextVariant.bodyMd}>
+            {t('ledgerConnectionInstructionStepFour')}
+          </Text>
+        </li>
+      </ul>
+      {transportStatus === HardwareTransportStates.deviceOpenFailure && (
+        <Button
+          variant={ButtonVariant.Link}
+          textAlign={TextAlign.Left}
+          fontWeight={FontWeight.Normal}
+          onClick={async () => {
+            if (environmentTypeIsFullScreen) {
+              window.location.reload();
+            } else {
+              global.platform.openExtensionInBrowser?.(null, null, true);
+            }
+          }}
+        >
+          {t('ledgerConnectionInstructionCloseOtherApps')}
+        </Button>
+      )}
+      {usingWebHID &&
+        webHidConnectedStatus === WebHIDConnectedStatuses.notConnected && (
+          <Button
+            variant={ButtonVariant.Link}
+            textAlign={TextAlign.Left}
+            fontWeight={FontWeight.Normal}
+            onClick={async () => {
+              if (environmentTypeIsFullScreen) {
+                const connectedDevices =
+                  await window.navigator.hid.requestDevice({
+                    filters: [{ vendorId: Number(LEDGER_USB_VENDOR_ID) }],
+                  });
+                const webHidIsConnected = connectedDevices.some(
+                  (device) => device.vendorId === Number(LEDGER_USB_VENDOR_ID),
+                );
+                dispatch(
+                  setLedgerWebHidConnectedStatus(
+                    webHidIsConnected
+                      ? WebHIDConnectedStatuses.connected
+                      : WebHIDConnectedStatuses.notConnected,
+                  ),
+                );
+              } else {
+                global.platform.openExtensionInBrowser?.(null, null, true);
+              }
+            }}
+          >
+            {environmentTypeIsFullScreen
+              ? t('clickToConnectLedgerViaWebHID')
+              : t('openFullScreenForLedgerWebHid')}
+          </Button>
+        )}
+    </BannerAlert>
+  );
+};
+
+export default LedgerInfo;
diff --git a/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap b/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
index 8e552794611b..6105816282ec 100644
--- a/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`ConfirmNav should match snapshot 1`] = `
 <div>
   <div
     class="mm-box mm-box--padding-3 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--background-color-background-default"
+    style="z-index: 2;"
   >
     <div
       class="mm-box mm-box--display-flex mm-box--align-items-center"
diff --git a/ui/pages/confirmations/components/confirm/nav/nav.test.tsx b/ui/pages/confirmations/components/confirm/nav/nav.test.tsx
index dec9e62fe067..113be2ecf147 100644
--- a/ui/pages/confirmations/components/confirm/nav/nav.test.tsx
+++ b/ui/pages/confirmations/components/confirm/nav/nav.test.tsx
@@ -112,6 +112,8 @@ describe('ConfirmNav', () => {
     const rejectAllButton = getByRole('button', { name: /Reject all/iu });
     const rejectSpy = jest
       .spyOn(Actions, 'rejectPendingApproval')
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       .mockImplementation(() => ({} as any));
     fireEvent.click(rejectAllButton);
     expect(rejectSpy).toHaveBeenCalledTimes(3);
diff --git a/ui/pages/confirmations/components/confirm/nav/nav.tsx b/ui/pages/confirmations/components/confirm/nav/nav.tsx
index 737251c0e6b9..537d7a20347d 100644
--- a/ui/pages/confirmations/components/confirm/nav/nav.tsx
+++ b/ui/pages/confirmations/components/confirm/nav/nav.tsx
@@ -61,9 +61,7 @@ const Nav = () => {
       // In new routing all confirmations will support
       // "/confirm-transaction/<confirmation_id>"
       history.replace(
-        `${CONFIRM_TRANSACTION_ROUTE}/${
-          pendingConfirmations[currentConfirmationPosition + pos].id
-        }${
+        `${CONFIRM_TRANSACTION_ROUTE}/${nextConfirmation.id}${
           isSignatureApprovalRequest(nextConfirmation)
             ? SIGNATURE_REQUEST_PATH
             : ''
@@ -96,6 +94,9 @@ const Nav = () => {
       flexDirection={FlexDirection.Row}
       justifyContent={JustifyContent.spaceBetween}
       padding={3}
+      style={{
+        zIndex: 2,
+      }}
     >
       <Box alignItems={AlignItems.center} display={Display.Flex}>
         <ButtonIcon
diff --git a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
new file mode 100644
index 000000000000..26966d4ac1d6
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
@@ -0,0 +1,608 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DataTree correctly renders reverse strings 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--width-full"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Sign into \\u202E EVIL:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          Sign into \\u202E EVIL
+        </p>
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          A number:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          1337
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`DataTree should match snapshot 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--width-full"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Contents:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          Hello, Bob!
+        </p>
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          From:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--width-full"
+      >
+        <div
+          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+        >
+          <div
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+            >
+              Name:
+            </p>
+          </div>
+          <div
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
+            >
+              Cow
+            </p>
+          </div>
+        </div>
+        <div
+          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+        >
+          <div
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+            >
+              Wallets:
+            </p>
+          </div>
+          <div
+            class="mm-box mm-box--width-full"
+          >
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  0:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+              >
+                <div
+                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                >
+                  <div
+                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  >
+                    <div
+                      class="mm-avatar-account__jazzicon"
+                    >
+                      <div
+                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
+                      >
+                        <svg
+                          height="16"
+                          width="16"
+                          x="0"
+                          y="0"
+                        >
+                          <rect
+                            fill="#FA7900"
+                            height="16"
+                            transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#034F5E"
+                            height="16"
+                            transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#FB185C"
+                            height="16"
+                            transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                    data-testid="confirm-info-row-display-name"
+                  >
+                    0xCD2a3...DD826
+                  </p>
+                </div>
+              </div>
+            </div>
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  1:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+              >
+                <div
+                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                >
+                  <div
+                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  >
+                    <div
+                      class="mm-avatar-account__jazzicon"
+                    >
+                      <div
+                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
+                      >
+                        <svg
+                          height="16"
+                          width="16"
+                          x="0"
+                          y="0"
+                        >
+                          <rect
+                            fill="#F91E01"
+                            height="16"
+                            transform="translate(-3.031601448459508 1.44638157917772) rotate(179.5 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#FA5300"
+                            height="16"
+                            transform="translate(0.001001577275992914 -7.592133809870717) rotate(370.7 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#F5A300"
+                            height="16"
+                            transform="translate(-9.667744843805323 10.267175012988094) rotate(298.9 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                    data-testid="confirm-info-row-display-name"
+                  >
+                    0xDeaDb...DbeeF
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          To:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--width-full"
+      >
+        <div
+          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+        >
+          <div
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+            >
+              0:
+            </p>
+          </div>
+          <div
+            class="mm-box mm-box--width-full"
+          >
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  Name:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
+                >
+                  Bob
+                </p>
+              </div>
+            </div>
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  Wallets:
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--width-full"
+              >
+                <div
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      0:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  >
+                    <div
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    >
+                      <div
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      >
+                        <div
+                          class="mm-avatar-account__jazzicon"
+                        >
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                          >
+                            <svg
+                              height="16"
+                              width="16"
+                              x="0"
+                              y="0"
+                            >
+                              <rect
+                                fill="#C8144A"
+                                height="16"
+                                transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#01878E"
+                                height="16"
+                                transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#1897F2"
+                                height="16"
+                                transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xbBbBB...bBBbB
+                      </p>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      1:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  >
+                    <div
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    >
+                      <div
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      >
+                        <div
+                          class="mm-avatar-account__jazzicon"
+                        >
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
+                          >
+                            <svg
+                              height="16"
+                              width="16"
+                              x="0"
+                              y="0"
+                            >
+                              <rect
+                                fill="#2395E1"
+                                height="16"
+                                transform="translate(-1.7353143855136905 0.5115867848025443) rotate(191.9 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#F90101"
+                                height="16"
+                                transform="translate(1.7169232764557802 -9.276715881533601) rotate(319.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#F58700"
+                                height="16"
+                                transform="translate(9.91414735179574 5.139720751783702) rotate(180.7 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xB0Bda...bEa57
+                      </p>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      2:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  >
+                    <div
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    >
+                      <div
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      >
+                        <div
+                          class="mm-avatar-account__jazzicon"
+                        >
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
+                          >
+                            <svg
+                              height="16"
+                              width="16"
+                              x="0"
+                              y="0"
+                            >
+                              <rect
+                                fill="#018E8C"
+                                height="16"
+                                transform="translate(3.988074950687866 0.3554940504644344) rotate(177.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#F29202"
+                                height="16"
+                                transform="translate(-7.220928666254465 -2.4813555582770794) rotate(334.6 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#236FE1"
+                                height="16"
+                                transform="translate(14.621768557060026 -6.282465882779628) rotate(456.1 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xB0B0b...00000
+                      </p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Attachment:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          0x
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.test.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.test.tsx
new file mode 100644
index 000000000000..8b83a01e4082
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/row/dataTree.test.tsx
@@ -0,0 +1,83 @@
+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 { DataTree } from './dataTree';
+
+const mockData = {
+  contents: { value: 'Hello, Bob!', type: 'string' },
+  from: {
+    value: {
+      name: { value: 'Cow', type: 'string' },
+      wallets: {
+        value: [
+          {
+            value: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
+            type: 'address',
+          },
+          {
+            value: '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF',
+            type: 'address',
+          },
+        ],
+        type: 'address[]',
+      },
+    },
+    type: 'Person',
+  },
+  to: {
+    value: [
+      {
+        value: {
+          name: { value: 'Bob', type: 'string' },
+          wallets: {
+            value: [
+              {
+                value: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
+                type: 'address',
+              },
+              {
+                value: '0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57',
+                type: 'address',
+              },
+              {
+                value: '0xB0B0b0b0b0b0B000000000000000000000000000',
+                type: 'address',
+              },
+            ],
+            type: 'address[]',
+          },
+        },
+        type: 'Person',
+      },
+    ],
+    type: 'Person[]',
+  },
+  attachment: { value: '0x', type: 'bytes' },
+};
+
+const store = configureStore(mockState);
+
+describe('DataTree', () => {
+  it('should match snapshot', () => {
+    const { container } = renderWithProvider(
+      <DataTree data={mockData} />,
+      store,
+    );
+    expect(container).toMatchSnapshot();
+  });
+
+  it('correctly renders reverse strings', () => {
+    const data = {
+      'Sign into \u202E EVIL': {
+        type: 'string',
+        value: 'Sign into \u202E EVIL',
+      },
+      'A number': { type: 'uint32', value: '1337' },
+    };
+    const { container } = renderWithProvider(<DataTree data={data} />, store);
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
new file mode 100644
index 000000000000..c72fc6113292
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+
+import { isValidHexAddress } from '../../../../../../shared/modules/hexstring-utils';
+import { sanitizeString } from '../../../../../helpers/utils/util';
+
+import { Box } from '../../../../../components/component-library';
+import { BlockSize } from '../../../../../helpers/constants/design-system';
+import {
+  ConfirmInfoRow,
+  ConfirmInfoRowAddress,
+  ConfirmInfoRowText,
+} from '../../../../../components/app/confirm/info/row';
+
+type ValueType = string | Record<string, TreeData> | TreeData[];
+
+export type TreeData = {
+  value: ValueType;
+  type: string;
+};
+
+export const DataTree = ({
+  data,
+}: {
+  data: Record<string, TreeData> | TreeData[];
+}) => (
+  <Box width={BlockSize.Full}>
+    {Object.entries(data).map(([label, { value, type }], i) => {
+      return (
+        <ConfirmInfoRow
+          label={`${sanitizeString(
+            label.charAt(0).toUpperCase() + label.slice(1),
+          )}:`}
+          style={{ paddingRight: 0 }}
+          key={`tree-data-${label}-index-${i}`}
+        >
+          {
+            // eslint-disable-next-line @typescript-eslint/no-use-before-define
+            <DataField value={value} type={type} />
+          }
+        </ConfirmInfoRow>
+      );
+    })}
+  </Box>
+);
+
+const DataField = ({ value, type }: { value: ValueType; type: string }) => {
+  if (typeof value === 'object' && value !== null) {
+    return <DataTree data={value} />;
+  }
+  if (
+    type === 'address' &&
+    isValidHexAddress(value, {
+      mixedCaseUseChecksum: true,
+    })
+  ) {
+    return <ConfirmInfoRowAddress address={value} />;
+  }
+  return <ConfirmInfoRowText text={sanitizeString(value)} />;
+};
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
new file mode 100644
index 000000000000..760f38e61738
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
@@ -0,0 +1,67 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--width-full"
+  >
+    <div
+      class="mm-box"
+      style="margin-left: -8px;"
+    >
+      <div
+        class="mm-box mm-box--width-full"
+      >
+        <div
+          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+        >
+          <div
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+            >
+              Message:
+            </p>
+          </div>
+          <div
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
+            >
+              Hi, Alice!
+            </p>
+          </div>
+        </div>
+        <div
+          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+        >
+          <div
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+            >
+              A number:
+            </p>
+          </div>
+          <div
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
+            >
+              1337
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.stories.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.stories.tsx
new file mode 100644
index 000000000000..94f9487c510f
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.stories.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import {
+  ConfirmInfoRow,
+  ConfirmInfoRowVariant,
+} from '../../../../../../components/app/confirm/info/row';
+import { unapprovedTypedSignMsgV1 } from '../../../../../../../test/data/confirmations/typed_sign';
+import { ConfirmInfoRowTypedSignDataV1 } from './typedSignDataV1';
+
+const ConfirmInfoRowTypedSignDataStory = {
+  title: 'Confirmations/Components/Confirm/ConfirmInfoRowTypedSignDataV1',
+
+  component: ConfirmInfoRowTypedSignDataV1,
+  argTypes: {
+    variant: {
+      control: 'select',
+      options: Object.values(ConfirmInfoRowVariant),
+    },
+    label: {
+      control: 'text',
+    },
+  },
+};
+
+export const DefaultStory = ({ variant, data }) => (
+  <ConfirmInfoRow label="Message" variant={variant}>
+    <ConfirmInfoRowTypedSignDataV1 data={data} />
+  </ConfirmInfoRow>
+);
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  data: unapprovedTypedSignMsgV1.msgParams.data,
+};
+
+export default ConfirmInfoRowTypedSignDataStory;
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.test.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.test.tsx
new file mode 100644
index 000000000000..293df91810bd
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.test.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+
+import { unapprovedTypedSignMsgV1 } from '../../../../../../../test/data/confirmations/typed_sign';
+import { ConfirmInfoRowTypedSignDataV1 } from './typedSignDataV1';
+
+describe('ConfirmInfoRowTypedSignData', () => {
+  it('should match snapshot', () => {
+    const { container } = render(
+      <ConfirmInfoRowTypedSignDataV1
+        data={unapprovedTypedSignMsgV1.msgParams.data}
+      />,
+    );
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should return null if data is not defined', () => {
+    const { container } = render(
+      <ConfirmInfoRowTypedSignDataV1 data={undefined} />,
+    );
+    expect(container).toBeEmptyDOMElement();
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.tsx
new file mode 100644
index 000000000000..eb7c5c5ecb02
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/typedSignDataV1.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import { Box } from '../../../../../../components/component-library';
+import { BlockSize } from '../../../../../../helpers/constants/design-system';
+import { TypedSignDataV1Type } from '../../../../types/confirm';
+import { DataTree } from '../dataTree';
+
+export const ConfirmInfoRowTypedSignDataV1 = ({
+  data,
+}: {
+  data?: TypedSignDataV1Type;
+}) => {
+  if (!data) {
+    return null;
+  }
+
+  const parsedData = data.reduce(
+    (val, { name, value, type }) => ({ ...val, [name]: { type, value } }),
+    {},
+  );
+
+  return (
+    <Box width={BlockSize.Full}>
+      <Box style={{ marginLeft: -8 }}>
+        <DataTree data={parsedData} />
+      </Box>
+    </Box>
+  );
+};
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
index 6025b8fc9d8b..f3b0cb0326ad 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
@@ -4,11 +4,10 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
 <div>
   <div
     class="mm-box mm-box--width-full"
-    style="margin: 0px -8px;"
   >
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px;"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
     >
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -24,6 +23,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
         >
           Mail
         </p>
@@ -31,14 +31,14 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
     </div>
     <div
       class="mm-box"
-      style="margin: 0px -8px;"
+      style="margin-left: -8px;"
     >
       <div
-        class="mm-box mm-box--margin-left-2"
+        class="mm-box mm-box--width-full"
       >
         <div
           class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-          style="overflow-wrap: anywhere; min-height: 24px;"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -54,43 +54,31 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+              style="white-space: pre-wrap;"
             >
               Hello, Bob!
             </p>
           </div>
         </div>
         <div
-          class="mm-box mm-box--margin-left-2"
+          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-            style="overflow-wrap: anywhere; min-height: 24px;"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
           >
-            <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-            >
-              <p
-                class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-              >
-                Name:
-              </p>
-            </div>
-            <div
-              class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            <p
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
             >
-              <p
-                class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-              >
-                Cow
-              </p>
-            </div>
+              From:
+            </p>
           </div>
           <div
-            class="mm-box mm-box--margin-left-2"
+            class="mm-box mm-box--width-full"
           >
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -98,70 +86,23 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  0:
+                  Name:
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
               >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
                 >
-                  <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
-                  >
-                    <div
-                      class="mm-avatar-account__jazzicon"
-                    >
-                      <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
-                      >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
-                        >
-                          <rect
-                            fill="#FA7900"
-                            height="16"
-                            transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#034F5E"
-                            height="16"
-                            transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#FB185C"
-                            height="16"
-                            transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    0xCD2a3...DD826
-                  </p>
-                </div>
+                  Cow
+                </p>
               </div>
             </div>
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -169,149 +110,248 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  1:
+                  Wallets:
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                class="mm-box mm-box--width-full"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      0:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                       >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
+                        <div
+                          class="mm-avatar-account__jazzicon"
                         >
-                          <rect
-                            fill="#F91E01"
-                            height="16"
-                            transform="translate(-3.031601448459508 1.44638157917772) rotate(179.5 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#FA5300"
-                            height="16"
-                            transform="translate(0.001001577275992914 -7.592133809870717) rotate(370.7 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#F5A300"
-                            height="16"
-                            transform="translate(-9.667744843805323 10.267175012988094) rotate(298.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
+                          >
+                            <svg
+                              height="16"
+                              width="16"
+                              x="0"
+                              y="0"
+                            >
+                              <rect
+                                fill="#FA7900"
+                                height="16"
+                                transform="translate(-0.1251869550000172 -0.18581992328639055) rotate(237.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#034F5E"
+                                height="16"
+                                transform="translate(5.484089776243406 -5.806818790918918) rotate(321.2 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#FB185C"
+                                height="16"
+                                transform="translate(4.337646399293827 10.83159092527544) rotate(190.8 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
                       </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xCD2a3...DD826
+                      </p>
                     </div>
                   </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    0xDeaDb...DbeeF
-                  </p>
                 </div>
-              </div>
-            </div>
-            <div
-              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-              >
-                <p
-                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                >
-                  2:
-                </p>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-              >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      1:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                       >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
+                        <div
+                          class="mm-avatar-account__jazzicon"
                         >
-                          <rect
-                            fill="#FA3E00"
-                            height="16"
-                            transform="translate(2.1189727229825075 3.7201589705667972) rotate(163.6 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#018E74"
-                            height="16"
-                            transform="translate(-3.5064720430845115 9.598091001429925) rotate(205.4 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#238FE1"
-                            height="16"
-                            transform="translate(-5.001213401730692 12.04822844354251) rotate(286.5 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
+                          >
+                            <svg
+                              height="16"
+                              width="16"
+                              x="0"
+                              y="0"
+                            >
+                              <rect
+                                fill="#F91E01"
+                                height="16"
+                                transform="translate(-3.031601448459508 1.44638157917772) rotate(179.5 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#FA5300"
+                                height="16"
+                                transform="translate(0.001001577275992914 -7.592133809870717) rotate(370.7 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#F5A300"
+                                height="16"
+                                transform="translate(-9.667744843805323 10.267175012988094) rotate(298.9 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
                       </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0xDeaDb...DbeeF
+                      </p>
                     </div>
                   </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
+                </div>
+                <div
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                >
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      2:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                   >
-                    0x06195...43896
-                  </p>
+                    <div
+                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    >
+                      <div
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      >
+                        <div
+                          class="mm-avatar-account__jazzicon"
+                        >
+                          <div
+                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
+                          >
+                            <svg
+                              height="16"
+                              width="16"
+                              x="0"
+                              y="0"
+                            >
+                              <rect
+                                fill="#FA3E00"
+                                height="16"
+                                transform="translate(2.1189727229825075 3.7201589705667972) rotate(163.6 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#018E74"
+                                height="16"
+                                transform="translate(-3.5064720430845115 9.598091001429925) rotate(205.4 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                              <rect
+                                fill="#238FE1"
+                                height="16"
+                                transform="translate(-5.001213401730692 12.04822844354251) rotate(286.5 8 8)"
+                                width="16"
+                                x="0"
+                                y="0"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                      <p
+                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                        data-testid="confirm-info-row-display-name"
+                      >
+                        0x06195...43896
+                      </p>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
         <div
-          class="mm-box mm-box--margin-left-2"
+          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--margin-left-2"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+            >
+              To:
+            </p>
+          </div>
+          <div
+            class="mm-box mm-box--width-full"
           >
             <div
               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px;"
+              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -319,232 +359,265 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
-                  Name:
-                </p>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
-              >
-                <p
-                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                >
-                  Bob
+                  0:
                 </p>
               </div>
-            </div>
-            <div
-              class="mm-box mm-box--margin-left-2"
-            >
               <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
+                class="mm-box mm-box--width-full"
               >
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                   >
-                    0:
-                  </p>
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Name:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Bob
+                    </p>
+                  </div>
                 </div>
                 <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                    >
+                      Wallets:
+                    </p>
+                  </div>
+                  <div
+                    class="mm-box mm-box--width-full"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          0:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                           >
-                            <rect
-                              fill="#C8144A"
-                              height="16"
-                              transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#01878E"
-                              height="16"
-                              transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#1897F2"
-                              height="16"
-                              transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                          </svg>
+                            <div
+                              class="mm-avatar-account__jazzicon"
+                            >
+                              <div
+                                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                              >
+                                <svg
+                                  height="16"
+                                  width="16"
+                                  x="0"
+                                  y="0"
+                                >
+                                  <rect
+                                    fill="#C8144A"
+                                    height="16"
+                                    transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#01878E"
+                                    height="16"
+                                    transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#1897F2"
+                                    height="16"
+                                    transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                          <p
+                            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                            data-testid="confirm-info-row-display-name"
+                          >
+                            0xbBbBB...bBBbB
+                          </p>
                         </div>
                       </div>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xbBbBB...bBBbB
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    1:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                  >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          1:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
+                          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                           >
-                            <rect
-                              fill="#2395E1"
-                              height="16"
-                              transform="translate(-1.7353143855136905 0.5115867848025443) rotate(191.9 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#F90101"
-                              height="16"
-                              transform="translate(1.7169232764557802 -9.276715881533601) rotate(319.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#F58700"
-                              height="16"
-                              transform="translate(9.91414735179574 5.139720751783702) rotate(180.7 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                          </svg>
+                            <div
+                              class="mm-avatar-account__jazzicon"
+                            >
+                              <div
+                                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
+                              >
+                                <svg
+                                  height="16"
+                                  width="16"
+                                  x="0"
+                                  y="0"
+                                >
+                                  <rect
+                                    fill="#2395E1"
+                                    height="16"
+                                    transform="translate(-1.7353143855136905 0.5115867848025443) rotate(191.9 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#F90101"
+                                    height="16"
+                                    transform="translate(1.7169232764557802 -9.276715881533601) rotate(319.8 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#F58700"
+                                    height="16"
+                                    transform="translate(9.91414735179574 5.139720751783702) rotate(180.7 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                          <p
+                            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                            data-testid="confirm-info-row-display-name"
+                          >
+                            0xB0Bda...bEa57
+                          </p>
                         </div>
                       </div>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xB0Bda...bEa57
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                style="overflow-wrap: anywhere; min-height: 24px;"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    2:
-                  </p>
-                </div>
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                  >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-avatar-account__jazzicon"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          2:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                       >
                         <div
-                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
+                          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
-                          <svg
-                            height="16"
-                            width="16"
-                            x="0"
-                            y="0"
+                          <div
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                           >
-                            <rect
-                              fill="#018E8C"
-                              height="16"
-                              transform="translate(3.988074950687866 0.3554940504644344) rotate(177.8 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#F29202"
-                              height="16"
-                              transform="translate(-7.220928666254465 -2.4813555582770794) rotate(334.6 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="#236FE1"
-                              height="16"
-                              transform="translate(14.621768557060026 -6.282465882779628) rotate(456.1 8 8)"
-                              width="16"
-                              x="0"
-                              y="0"
-                            />
-                          </svg>
+                            <div
+                              class="mm-avatar-account__jazzicon"
+                            >
+                              <div
+                                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
+                              >
+                                <svg
+                                  height="16"
+                                  width="16"
+                                  x="0"
+                                  y="0"
+                                >
+                                  <rect
+                                    fill="#018E8C"
+                                    height="16"
+                                    transform="translate(3.988074950687866 0.3554940504644344) rotate(177.8 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#F29202"
+                                    height="16"
+                                    transform="translate(-7.220928666254465 -2.4813555582770794) rotate(334.6 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                  <rect
+                                    fill="#236FE1"
+                                    height="16"
+                                    transform="translate(14.621768557060026 -6.282465882779628) rotate(456.1 8 8)"
+                                    width="16"
+                                    x="0"
+                                    y="0"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                          <p
+                            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                            data-testid="confirm-info-row-display-name"
+                          >
+                            0xB0B0b...00000
+                          </p>
                         </div>
                       </div>
                     </div>
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                      data-testid="confirm-info-row-display-name"
-                    >
-                      0xB0B0b...00000
-                    </p>
                   </div>
                 </div>
               </div>
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/dataTree.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data/dataTree.tsx
deleted file mode 100644
index 4a2481d4219b..000000000000
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/dataTree.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-
-import { isValidHexAddress } from '../../../../../../../shared/modules/hexstring-utils';
-import { sanitizeString } from '../../../../../../helpers/utils/util';
-
-import { Box } from '../../../../../../components/component-library';
-import {
-  ConfirmInfoRow,
-  ConfirmInfoRowAddress,
-  ConfirmInfoRowText,
-} from '../../../../../../components/app/confirm/info/row';
-
-type TreeData = {
-  value: string | Record<string, TreeData>;
-  type: string;
-};
-
-export const DataTree = ({ data }: { data: Record<string, TreeData> }) => (
-  <Box marginLeft={2}>
-    {Object.entries(data).map(([label, { value, type }], i) => {
-      if (typeof value === 'object' && value !== null) {
-        return <DataTree data={value} key={`tree-data-${label}-index-${i}`} />;
-      }
-      return (
-        <ConfirmInfoRow
-          label={`${sanitizeString(
-            label.charAt(0).toUpperCase() + label.slice(1),
-          )}:`}
-          key={`tree-data-${label}-index-${i}`}
-        >
-          {type === 'address' &&
-          isValidHexAddress(value, {
-            mixedCaseUseChecksum: true,
-          }) ? (
-            <ConfirmInfoRowAddress address={value} />
-          ) : (
-            <ConfirmInfoRowText text={value} />
-          )}
-        </ConfirmInfoRow>
-      );
-    })}
-  </Box>
-);
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.test.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.test.tsx
index 34d88a1e4acd..fbe31564d19e 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.test.tsx
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.test.tsx
@@ -33,7 +33,11 @@ describe('ConfirmInfoRowTypedSignData', () => {
   });
 
   it('should not render data whose type is not defined', () => {
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (rawMessageV4.message as any).do_not_display = 'one';
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (rawMessageV4.message as any).do_not_display_2 = {
       do_not_display: 'two',
     };
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx
index 9015c1e16ec3..3b3500c637a3 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx
@@ -9,7 +9,7 @@ import {
   ConfirmInfoRowText,
 } from '../../../../../../components/app/confirm/info/row';
 
-import { DataTree } from './dataTree';
+import { DataTree } from '../dataTree';
 
 const parseMessage = (dataToParse: string) => {
   const { message, primaryType, types } = JSON.parse(dataToParse);
@@ -27,11 +27,14 @@ export const ConfirmInfoRowTypedSignData = ({ data }: { data: string }) => {
   const { sanitizedMessage, primaryType } = parseMessage(data);
 
   return (
-    <Box width={BlockSize.Full} style={{ margin: '0 -8px' }}>
-      <ConfirmInfoRow label={`${t('primaryType')}:`}>
+    <Box width={BlockSize.Full}>
+      <ConfirmInfoRow
+        label={`${t('primaryType')}:`}
+        style={{ paddingLeft: 0, paddingRight: 0 }}
+      >
         <ConfirmInfoRowText text={primaryType} />
       </ConfirmInfoRow>
-      <Box style={{ margin: '0 -8px' }}>
+      <Box style={{ marginLeft: -8 }}>
         <DataTree data={sanitizedMessage.value} />
       </Box>
     </Box>
diff --git a/ui/pages/confirmations/components/confirm/scroll-to-bottom/index.scss b/ui/pages/confirmations/components/confirm/scroll-to-bottom/index.scss
index 9fa2f5f1c639..6ca326a71dc6 100644
--- a/ui/pages/confirmations/components/confirm/scroll-to-bottom/index.scss
+++ b/ui/pages/confirmations/components/confirm/scroll-to-bottom/index.scss
@@ -12,11 +12,11 @@
   z-index: 201;
 
   /**
-    override design-system defaults. current bug exists that sets background-color to #00000005,
-    there's a problem that the color may not match the #000000 background-color
+    override design-system defaults.
     */
   &:hover {
-    background-color: var(--color-background-default);
+    background-color: var(--color-primary-default);
+    color: var(--color-primary-inverse);
     opacity: 0.95;
   }
 }
diff --git a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx
index a991d80a6ee3..258b6ce2b16c 100644
--- a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx
+++ b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx
@@ -1,18 +1,31 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
+import { unapprovedTypedSignMsgV4 } from '../../../../../../test/data/confirmations/typed_sign';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
 import * as ConfirmDucks from '../../../../../ducks/confirm/confirm';
+import * as usePreviousHooks from '../../../../../hooks/usePrevious';
 import ScrollToBottom from './scroll-to-bottom';
 
 const buttonSelector = '.confirm-scroll-to-bottom__button';
 
+const mockState = {
+  confirm: {
+    currentConfirmation: unapprovedTypedSignMsgV4,
+  },
+};
+
+const mockSetHasScrolledToBottom = jest.fn();
+
 const mockUseScrollRequiredResult = {
   hasScrolledToBottom: false,
   isScrollable: false,
   isScrolledToBottom: false,
   onScroll: jest.fn(),
   scrollToBottom: jest.fn(),
-  ref: { current: null },
+  setHasScrolledToBottom: mockSetHasScrolledToBottom,
+  ref: {
+    current: {},
+  },
 };
 
 const mockedUseScrollRequiredResult = jest.mocked(mockUseScrollRequiredResult);
@@ -22,6 +35,10 @@ jest.mock('../../../../../hooks/useScrollRequired', () => ({
 }));
 
 describe('ScrollToBottom', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   describe('when content is not scrollable', () => {
     it('renders without button', () => {
       const { container, getByText } = renderWithProvider(
@@ -29,7 +46,7 @@ describe('ScrollToBottom', () => {
           <div>foo</div>
           <div>bar</div>
         </ScrollToBottom>,
-        configureMockStore([])(),
+        configureMockStore([])(mockState),
       );
 
       expect(getByText('foo')).toBeInTheDocument();
@@ -41,7 +58,7 @@ describe('ScrollToBottom', () => {
       const updateSpy = jest.spyOn(ConfirmDucks, 'updateConfirm');
       renderWithProvider(
         <ScrollToBottom>foobar</ScrollToBottom>,
-        configureMockStore([])(),
+        configureMockStore([])(mockState),
       );
 
       expect(updateSpy).toHaveBeenCalledWith({
@@ -63,7 +80,7 @@ describe('ScrollToBottom', () => {
             <div>bar</div>
           </ScrollToBottom>
         </div>,
-        configureMockStore([])(),
+        configureMockStore([])(mockState),
       );
 
       expect(getByText('foo')).toBeInTheDocument();
@@ -75,7 +92,7 @@ describe('ScrollToBottom', () => {
       const updateSpy = jest.spyOn(ConfirmDucks, 'updateConfirm');
       renderWithProvider(
         <ScrollToBottom>foobar</ScrollToBottom>,
-        configureMockStore([])(),
+        configureMockStore([])(mockState),
       );
 
       expect(updateSpy).toHaveBeenCalledWith({
@@ -83,6 +100,49 @@ describe('ScrollToBottom', () => {
       });
     });
 
+    it('does not scroll to the top while the confirmation id does not change', () => {
+      const mockScrollTo = jest.fn();
+      const originalScrollTo = window.HTMLDivElement.prototype.scrollTo;
+      window.HTMLDivElement.prototype.scrollTo = mockScrollTo;
+
+      jest
+        .spyOn(usePreviousHooks, 'usePrevious')
+        .mockImplementation(() => unapprovedTypedSignMsgV4.id);
+
+      renderWithProvider(
+        <ScrollToBottom>foobar</ScrollToBottom>,
+        configureMockStore([])(mockState),
+      );
+
+      expect(mockScrollTo).not.toHaveBeenCalled();
+
+      window.HTMLDivElement.prototype.scrollTo = originalScrollTo;
+    });
+
+    it('scrolls to the top when the confirmation changes', () => {
+      const mockScrollTo = jest.fn();
+      const originalScrollTo = window.HTMLDivElement.prototype.scrollTo;
+      window.HTMLDivElement.prototype.scrollTo = mockScrollTo;
+
+      renderWithProvider(
+        <ScrollToBottom>foobar</ScrollToBottom>,
+        configureMockStore([])(mockState),
+      );
+
+      expect(mockScrollTo).toHaveBeenCalledWith(0, 0);
+
+      window.HTMLDivElement.prototype.scrollTo = originalScrollTo;
+    });
+
+    it('resets setHasScrolledToBottom to false when the confirmation changes', () => {
+      renderWithProvider(
+        <ScrollToBottom>foobar</ScrollToBottom>,
+        configureMockStore([])(mockState),
+      );
+
+      expect(mockSetHasScrolledToBottom).toHaveBeenCalledWith(false);
+    });
+
     describe('when user has scrolled to the bottom', () => {
       beforeEach(() => {
         mockedUseScrollRequiredResult.isScrolledToBottom = true;
@@ -91,7 +151,7 @@ describe('ScrollToBottom', () => {
       it('hides the button', () => {
         const { container } = renderWithProvider(
           <ScrollToBottom>foobar</ScrollToBottom>,
-          configureMockStore([])(),
+          configureMockStore([])(mockState),
         );
 
         expect(container.querySelector(buttonSelector)).not.toBeInTheDocument();
@@ -101,7 +161,7 @@ describe('ScrollToBottom', () => {
         const updateSpy = jest.spyOn(ConfirmDucks, 'updateConfirm');
         const { container } = renderWithProvider(
           <ScrollToBottom>foobar</ScrollToBottom>,
-          configureMockStore([])(),
+          configureMockStore([])(mockState),
         );
 
         expect(container.querySelector(buttonSelector)).not.toBeInTheDocument();
diff --git a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx
index 900333a2d111..56a812531fa4 100644
--- a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx
+++ b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { I18nContext } from '../../../../../contexts/i18n';
 import {
   Box,
@@ -16,8 +16,10 @@ import {
   IconColor,
   BorderRadius,
 } from '../../../../../helpers/constants/design-system';
+import { usePrevious } from '../../../../../hooks/usePrevious';
 import { useScrollRequired } from '../../../../../hooks/useScrollRequired';
 import { updateConfirm } from '../../../../../ducks/confirm/confirm';
+import { currentConfirmationSelector } from '../../../selectors';
 
 type ContentProps = {
   /**
@@ -29,6 +31,8 @@ type ContentProps = {
 const ScrollToBottom = ({ children }: ContentProps) => {
   const t = useContext(I18nContext);
   const dispatch = useDispatch();
+  const currentConfirmation = useSelector(currentConfirmationSelector);
+  const previousId = usePrevious(currentConfirmation?.id);
 
   const {
     hasScrolledToBottom,
@@ -36,8 +40,30 @@ const ScrollToBottom = ({ children }: ContentProps) => {
     isScrolledToBottom,
     onScroll,
     scrollToBottom,
+    setHasScrolledToBottom,
     ref,
-  } = useScrollRequired([]);
+  } = useScrollRequired([currentConfirmation?.id], { offsetPxFromBottom: 0 });
+
+  /**
+   * Scroll to the top of the page when the confirmation changes. This happens
+   * when we navigate through different confirmations. Also, resets hasScrolledToBottom
+   */
+  useEffect(() => {
+    if (previousId === currentConfirmation?.id) {
+      return;
+    }
+
+    const currentRef = ref?.current as null | HTMLDivElement;
+    if (!currentRef) {
+      return;
+    }
+
+    if (typeof currentRef.scrollTo === 'function') {
+      currentRef.scrollTo(0, 0);
+    }
+
+    setHasScrolledToBottom(false);
+  }, [currentConfirmation?.id, previousId, ref?.current]);
 
   useEffect(() => {
     dispatch(
@@ -49,11 +75,13 @@ const ScrollToBottom = ({ children }: ContentProps) => {
 
   return (
     <Box
+      backgroundColor={BackgroundColor.backgroundAlternative}
       width={BlockSize.Full}
       height={BlockSize.Full}
       style={{
         /** As a flex child, this ensures the element stretches the full available space without overflowing */
         minHeight: '0',
+        overflow: 'hidden',
         /**
          * This is for the scroll button. If we placed position: relative on the element below, with overflow: 'auto',
          * the button would be positioned absolute to the entire content relative the scroll container. Thus, it would
@@ -67,6 +95,8 @@ const ScrollToBottom = ({ children }: ContentProps) => {
         flexDirection={FlexDirection.Column}
         width={BlockSize.Full}
         height={BlockSize.Full}
+        paddingLeft={4}
+        paddingRight={4}
         onScroll={onScroll}
         ref={ref}
         style={{ overflow: 'auto' }}
diff --git a/ui/pages/confirmations/components/confirm/signature-message/signature-message.tsx b/ui/pages/confirmations/components/confirm/signature-message/signature-message.tsx
index c336b9c8fc9a..5b37a251a8b0 100644
--- a/ui/pages/confirmations/components/confirm/signature-message/signature-message.tsx
+++ b/ui/pages/confirmations/components/confirm/signature-message/signature-message.tsx
@@ -13,10 +13,13 @@ import {
   ConfirmInfoRow,
   ConfirmInfoRowText,
 } from '../../../../../components/app/confirm/info/row';
+import { SignatureRequestType } from '../../../types/confirm';
 
 const SignatureMessage: React.FC = memo(() => {
   const t = useI18nContext();
-  const currentConfirmation = useSelector(currentConfirmationSelector);
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as SignatureRequestType;
 
   if (!currentConfirmation?.msgParams?.data) {
     return null;
diff --git a/ui/pages/confirmations/components/confirm/title/title.test.tsx b/ui/pages/confirmations/components/confirm/title/title.test.tsx
index bde8370c19d4..6d65ce10f194 100644
--- a/ui/pages/confirmations/components/confirm/title/title.test.tsx
+++ b/ui/pages/confirmations/components/confirm/title/title.test.tsx
@@ -2,25 +2,57 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { TransactionType } from '@metamask/transaction-controller';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
+import { Confirmation } from '../../../types/confirm';
 import ConfirmTitle from './title';
 
-const mockState = {
+const genMockState = (confirmationOverride: Partial<Confirmation> = {}) => ({
   confirm: {
     currentConfirmation: {
       type: TransactionType.personalSign,
+      ...confirmationOverride,
     },
   },
-};
+});
 
 describe('ConfirmTitle', () => {
-  it('should render the title and description', () => {
-    const mockStore = configureMockStore([])(mockState);
+  it('should render the title and description for a personal signature', () => {
+    const mockStore = configureMockStore([])(
+      genMockState({ type: TransactionType.personalSign }),
+    );
+    const { getByText } = renderWithProvider(<ConfirmTitle />, mockStore);
+
+    expect(getByText('Signature request')).toBeInTheDocument();
+    expect(
+      getByText(
+        'Only confirm this message if you approve the content and trust the requesting site.',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('should render the title and description for typed signature', () => {
+    const mockStore = configureMockStore([])(
+      genMockState({ type: TransactionType.signTypedData }),
+    );
     const { getByText } = renderWithProvider(<ConfirmTitle />, mockStore);
 
     expect(getByText('Signature request')).toBeInTheDocument();
     expect(
       getByText(
-        'Only sign this message if you fully understand the content and trust the requesting site',
+        'Only confirm this message if you approve the content and trust the requesting site.',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('should render the title and description for a contract interaction transaction', () => {
+    const mockStore = configureMockStore([])(
+      genMockState({ type: TransactionType.contractInteraction }),
+    );
+    const { getByText } = renderWithProvider(<ConfirmTitle />, mockStore);
+
+    expect(getByText('Transaction request')).toBeInTheDocument();
+    expect(
+      getByText(
+        'Only confirm this transaction if you fully understand the content and trust the requesting site.',
       ),
     ).toBeInTheDocument();
   });
diff --git a/ui/pages/confirmations/components/confirm/title/title.tsx b/ui/pages/confirmations/components/confirm/title/title.tsx
index 81b1a731c475..40b2087d045b 100644
--- a/ui/pages/confirmations/components/confirm/title/title.tsx
+++ b/ui/pages/confirmations/components/confirm/title/title.tsx
@@ -1,31 +1,38 @@
+import { TransactionType } from '@metamask/transaction-controller';
 import React, { memo, useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { TransactionType } from '@metamask/transaction-controller';
 import { Text } from '../../../../../components/component-library';
 import {
-  TextVariant,
   TextAlign,
   TextColor,
+  TextVariant,
 } from '../../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { currentConfirmationSelector } from '../../../../../selectors';
+import { Confirmation } from '../../../types/confirm';
 
 const ConfirmTitle: React.FC = memo(() => {
   const t = useI18nContext();
-  const currentConfirmation = useSelector(currentConfirmationSelector);
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as Confirmation;
 
   const typeToTitleTKey: Partial<Record<TransactionType, string>> = useMemo(
     () => ({
       [TransactionType.personalSign]: t('confirmTitleSignature'),
       [TransactionType.signTypedData]: t('confirmTitleSignature'),
+      [TransactionType.contractInteraction]: t('confirmTitleTransaction'),
     }),
     [],
   );
 
   const typeToDescTKey: Partial<Record<TransactionType, string>> = useMemo(
     () => ({
-      [TransactionType.personalSign]: t('confirmTitleDescPersonalSignature'),
-      [TransactionType.signTypedData]: t('confirmTitleDescTypedDataSignature'),
+      [TransactionType.personalSign]: t('confirmTitleDescSignature'),
+      [TransactionType.signTypedData]: t('confirmTitleDescSignature'),
+      [TransactionType.contractInteraction]: t(
+        'confirmTitleDescContractInteractionTransaction',
+      ),
     }),
     [],
   );
@@ -34,8 +41,14 @@ const ConfirmTitle: React.FC = memo(() => {
     return null;
   }
 
-  const title = typeToTitleTKey[currentConfirmation.type];
-  const description = typeToDescTKey[currentConfirmation.type];
+  const title =
+    typeToTitleTKey[
+      currentConfirmation.type || TransactionType.contractInteraction
+    ];
+  const description =
+    typeToDescTKey[
+      currentConfirmation.type || TransactionType.contractInteraction
+    ];
 
   return (
     <>
diff --git a/ui/pages/confirmations/components/confirm/utils.test.ts b/ui/pages/confirmations/components/confirm/utils.test.ts
new file mode 100644
index 000000000000..2250d62fa62c
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/utils.test.ts
@@ -0,0 +1,36 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  CONTRACT_INTERACTION_SENDER_ADDRESS,
+  genUnapprovedContractInteractionConfirmation,
+} from '../../../../../test/data/confirmations/contract-interaction';
+import {
+  PERSONAL_SIGN_SENDER_ADDRESS,
+  unapprovedPersonalSignMsg,
+} from '../../../../../test/data/confirmations/personal_sign';
+import { SignatureRequestType } from '../../types/confirm';
+import { getConfirmationSender } from './utils';
+
+describe('getConfirmationSender()', () => {
+  test("returns the sender address from a signature if it's passed", () => {
+    const testCurrentConfirmation =
+      genUnapprovedContractInteractionConfirmation() as TransactionMeta;
+    const { from } = getConfirmationSender(testCurrentConfirmation);
+
+    expect(from).toEqual(CONTRACT_INTERACTION_SENDER_ADDRESS);
+  });
+
+  test("returns the sender address from a transaction if it's passed", () => {
+    const testCurrentConfirmation =
+      unapprovedPersonalSignMsg as SignatureRequestType;
+    const { from } = getConfirmationSender(testCurrentConfirmation);
+
+    expect(from).toEqual(PERSONAL_SIGN_SENDER_ADDRESS);
+  });
+
+  test('returns no sender address if no confirmation is passed', () => {
+    const testCurrentConfirmation = undefined;
+    const { from } = getConfirmationSender(testCurrentConfirmation);
+
+    expect(from).toEqual(undefined);
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/utils.ts b/ui/pages/confirmations/components/confirm/utils.ts
new file mode 100644
index 000000000000..21b4aac78998
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/utils.ts
@@ -0,0 +1,19 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { Confirmation, SignatureRequestType } from '../../types/confirm';
+
+export const getConfirmationSender = (
+  currentConfirmation: Confirmation | undefined,
+): { from: string | undefined } => {
+  const msgParams = (currentConfirmation as SignatureRequestType)?.msgParams;
+  const txParams = (currentConfirmation as TransactionMeta)?.txParams;
+
+  let from: string | undefined;
+  if (msgParams) {
+    from = msgParams.from;
+  }
+  if (txParams) {
+    from = txParams.from;
+  }
+
+  return { from };
+};
diff --git a/ui/pages/confirmations/components/edit-gas-fee-button/edit-gas-fee-button.test.js b/ui/pages/confirmations/components/edit-gas-fee-button/edit-gas-fee-button.test.js
index 4ad0a3d6c0a2..55b27e3d4234 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-button/edit-gas-fee-button.test.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-button/edit-gas-fee-button.test.js
@@ -14,6 +14,7 @@ import mockEstimates from '../../../../../test/data/mock-estimates.json';
 import mockState from '../../../../../test/data/mock-state.json';
 import configureStore from '../../../../store/store';
 
+import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
 import EditGasFeeButton from './edit-gas-fee-button';
 
 jest.mock('../../../../store/actions', () => ({
@@ -27,13 +28,16 @@ jest.mock('../../../../store/actions', () => ({
   createTransactionEventFragment: jest.fn(),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async ({ componentProps, contextProps } = {}) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-fee-popover.test.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-fee-popover.test.js
index 51a996678119..9a6472824c5c 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-fee-popover.test.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-fee-popover.test.js
@@ -91,9 +91,6 @@ const render = async ({ txProps, contextProps } = {}) => {
           balance: '0x1F4',
         },
       },
-      identities: {
-        '0xAddress': {},
-      },
       internalAccounts: {
         accounts: {
           'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -112,7 +109,6 @@ const render = async ({ txProps, contextProps } = {}) => {
         },
         selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
       },
-      selectedAddress: '0xAddress',
       featureFlags: { advancedInlineGas: true },
       gasFeeEstimates: MOCK_FEE_ESTIMATE,
       gasFeeEstimatesByChainId: {
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js
index 6f793514cd1c..a2b1fe272160 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js
@@ -93,9 +93,6 @@ const render = async ({
           balance: '0x176e5b6f173ebe66',
         },
       },
-      identities: {
-        '0xAddress': {},
-      },
       internalAccounts: {
         accounts: {
           mockId: {
@@ -121,7 +118,6 @@ const render = async ({
         },
         selectedAccount: 'mock-id',
       },
-      selectedAddress: '0xAddress',
       featureFlags: { advancedInlineGas: true },
       gasEstimateType: 'fee-market',
       gasFeeEstimates: MOCK_FEE_ESTIMATE,
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.test.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.test.js
index 8e365ff9012f..fe465030409e 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.test.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.test.js
@@ -50,10 +50,6 @@ const render = async (componentProps) => {
           balance: '0x176e5b6f173ebe66',
         },
       },
-      identities: {
-        '0xAddress': {},
-      },
-      selectedAddress: '0xAddress',
       internalAccounts: {
         accounts: {
           mockId: {
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
index a592670ed07c..29b1f1c62080 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
@@ -5,6 +5,7 @@ import { useGasFeeContext } from '../../../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { NetworkStabilityTooltip } from '../tooltips';
 
+/* eslint-disable @metamask/design-tokens/color-no-hex */
 const GRADIENT_COLORS = [
   '#037DD6',
   '#1876C8',
@@ -18,6 +19,7 @@ const GRADIENT_COLORS = [
   '#C54055',
   '#D73A49',
 ];
+/* eslint-enable @metamask/design-tokens/color-no-hex */
 
 const determineStatusInfo = (givenNetworkCongestion) => {
   const networkCongestion = givenNetworkCongestion ?? 0.5;
diff --git a/ui/pages/confirmations/components/fee-details-component/fee-details-component.js b/ui/pages/confirmations/components/fee-details-component/fee-details-component.js
index 0c84336bed3e..876f46450b49 100644
--- a/ui/pages/confirmations/components/fee-details-component/fee-details-component.js
+++ b/ui/pages/confirmations/components/fee-details-component/fee-details-component.js
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
@@ -18,16 +18,12 @@ import {
   Text,
 } from '../../../../components/component-library';
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
-import {
-  getIsMultiLayerFeeNetwork,
-  getPreferences,
-} from '../../../../selectors';
+import { getPreferences } from '../../../../selectors';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import LoadingHeartBeat from '../../../../components/ui/loading-heartbeat';
 import UserPreferencedCurrencyDisplay from '../../../../components/app/user-preferenced-currency-display/user-preferenced-currency-display.component';
 import { PRIMARY, SECONDARY } from '../../../../helpers/constants/common';
 import { addHexes } from '../../../../../shared/modules/conversion.utils';
-import fetchEstimatedL1Fee from '../../../../helpers/utils/optimism/fetchEstimatedL1Fee';
 import { useGasFeeContext } from '../../../../contexts/gasFee';
 
 export default function FeeDetailsComponent({
@@ -35,34 +31,18 @@ export default function FeeDetailsComponent({
   useCurrencyRateCheck,
   hideGasDetails = false,
 }) {
+  const layer1GasFee = txData?.layer1GasFee ?? null;
   const [expandFeeDetails, setExpandFeeDetails] = useState(false);
-  const [estimatedL1Fees, setEstimatedL1Fees] = useState(null);
 
-  const isMultiLayerFeeNetwork = useSelector(getIsMultiLayerFeeNetwork);
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
 
   const t = useI18nContext();
 
   const { minimumCostInHexWei: hexMinimumTransactionFee } = useGasFeeContext();
-  useEffect(() => {
-    if (isMultiLayerFeeNetwork) {
-      fetchEstimatedL1Fee(txData?.chainId, txData)
-        .then((result) => {
-          setEstimatedL1Fees(result);
-        })
-        .catch((_err) => {
-          setEstimatedL1Fees(null);
-        });
-    }
-  }, [isMultiLayerFeeNetwork, txData]);
 
   const getTransactionFeeTotal = useMemo(() => {
-    if (isMultiLayerFeeNetwork) {
-      return addHexes(hexMinimumTransactionFee, estimatedL1Fees || 0);
-    }
-
-    return hexMinimumTransactionFee;
-  }, [isMultiLayerFeeNetwork, hexMinimumTransactionFee, estimatedL1Fees]);
+    return addHexes(hexMinimumTransactionFee, layer1GasFee ?? 0);
+  }, [hexMinimumTransactionFee, layer1GasFee]);
 
   const renderTotalDetailText = useCallback(
     (value) => {
@@ -98,6 +78,8 @@ export default function FeeDetailsComponent({
     [txData, useNativeCurrencyAsPrimaryCurrency],
   );
 
+  const hasLayer1GasFee = layer1GasFee !== null;
+
   return (
     <>
       <Box
@@ -106,7 +88,7 @@ export default function FeeDetailsComponent({
         justifyContent={JustifyContent.center}
         flexDirection={FlexDirection.Column}
       >
-        {!hideGasDetails && isMultiLayerFeeNetwork && (
+        {!hideGasDetails && hasLayer1GasFee && (
           <Box
             padding={4}
             display={Display.Flex}
@@ -137,9 +119,9 @@ export default function FeeDetailsComponent({
 
       {!hideGasDetails && expandFeeDetails && (
         <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
-          {isMultiLayerFeeNetwork && (
+          {hasLayer1GasFee && (
             <TransactionDetailItem
-              detailTitle={t('optimismFees')}
+              detailTitle={t('layer2Fees')}
               detailText={
                 useCurrencyRateCheck &&
                 renderTotalDetailText(hexMinimumTransactionFee)
@@ -148,24 +130,26 @@ export default function FeeDetailsComponent({
               boldHeadings={false}
             />
           )}
-          {isMultiLayerFeeNetwork && estimatedL1Fees && (
+          {layer1GasFee && (
             <TransactionDetailItem
               detailTitle={t('layer1Fees')}
               detailText={
-                useCurrencyRateCheck && renderTotalDetailText(estimatedL1Fees)
+                useCurrencyRateCheck && renderTotalDetailText(layer1GasFee)
               }
-              detailTotal={renderTotalDetailValue(estimatedL1Fees)}
+              detailTotal={renderTotalDetailValue(layer1GasFee)}
               boldHeadings={false}
             />
           )}
-          <TransactionDetailItem
-            detailTitle={t('total')}
-            detailText={
-              useCurrencyRateCheck &&
-              renderTotalDetailText(getTransactionFeeTotal)
-            }
-            detailTotal={renderTotalDetailValue(getTransactionFeeTotal)}
-          />
+          {!hasLayer1GasFee && (
+            <TransactionDetailItem
+              detailTitle={t('total')}
+              detailText={
+                useCurrencyRateCheck &&
+                renderTotalDetailText(getTransactionFeeTotal)
+              }
+              detailTotal={renderTotalDetailValue(getTransactionFeeTotal)}
+            />
+          )}
         </Box>
       )}
     </>
diff --git a/ui/pages/confirmations/components/fee-details-component/fee-details-component.test.js b/ui/pages/confirmations/components/fee-details-component/fee-details-component.test.js
index 881df8659914..f6fc7ecdff13 100644
--- a/ui/pages/confirmations/components/fee-details-component/fee-details-component.test.js
+++ b/ui/pages/confirmations/components/fee-details-component/fee-details-component.test.js
@@ -22,7 +22,11 @@ const render = async (state = {}) => {
   let result;
 
   await act(
-    async () => (result = renderWithProvider(<FeeDetailsComponent />, store)),
+    async () =>
+      (result = renderWithProvider(
+        <FeeDetailsComponent txData={{ layer1GasFee: '0x0' }} />,
+        store,
+      )),
   );
 
   return result;
@@ -85,4 +89,33 @@ describe('FeeDetailsComponent', () => {
     });
     expect(screen.queryByText('Fee details')).toBeInTheDocument();
   });
+
+  it('should not display total in details section for layer 2 network', async () => {
+    await render({
+      ...mockState,
+      metamask: {
+        ...mockState.metamask,
+        networkDetails: {
+          EIPS: {
+            1559: false,
+          },
+        },
+        networksMetadata: {
+          goerli: {
+            EIPS: {
+              1559: false,
+            },
+            status: 'available',
+          },
+        },
+        providerConfig: {
+          chainId: CHAIN_IDS.OPTIMISM,
+        },
+      },
+    });
+    await act(async () => {
+      screen.getByRole('button').click();
+    });
+    expect(screen.queryByText('Totals')).not.toBeInTheDocument();
+  });
 });
diff --git a/ui/pages/confirmations/components/gas-details-item/gas-details-item.js b/ui/pages/confirmations/components/gas-details-item/gas-details-item.js
index cc3d3b1f43e5..50309e1c27f3 100644
--- a/ui/pages/confirmations/components/gas-details-item/gas-details-item.js
+++ b/ui/pages/confirmations/components/gas-details-item/gas-details-item.js
@@ -1,14 +1,21 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import { useSelector } from 'react-redux';
-import { Text } from '../../../../components/component-library';
-import { TextColor } from '../../../../helpers/constants/design-system';
+import {
+  Icon,
+  IconName,
+  IconSize,
+  Text,
+} from '../../../../components/component-library';
+import {
+  IconColor,
+  TextColor,
+} from '../../../../helpers/constants/design-system';
 import { PRIMARY, SECONDARY } from '../../../../helpers/constants/common';
 import { PriorityLevels } from '../../../../../shared/constants/gas';
 import {
-  getIsMultiLayerFeeNetwork,
   getPreferences,
   getTxData,
   getUseCurrencyRateCheck,
@@ -27,9 +34,9 @@ import Box from '../../../../components/ui/box';
 import LoadingHeartBeat from '../../../../components/ui/loading-heartbeat';
 import EditGasFeeIcon from '../edit-gas-fee-icon/edit-gas-fee-icon';
 import GasTiming from '../gas-timing/gas-timing.component';
-import fetchEstimatedL1Fee from '../../../../helpers/utils/optimism/fetchEstimatedL1Fee';
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
 import UserPreferencedCurrencyDisplay from '../../../../components/app/user-preferenced-currency-display';
+import Tooltip from '../../../../components/ui/tooltip';
 
 const GasDetailsItem = ({
   'data-testid': dataTestId,
@@ -37,22 +44,8 @@ const GasDetailsItem = ({
 }) => {
   const t = useI18nContext();
 
-  const isMultiLayerFeeNetwork = useSelector(getIsMultiLayerFeeNetwork);
   const txData = useSelector(getTxData);
-
-  const [estimatedL1Fees, setEstimatedL1Fees] = useState(null);
-
-  useEffect(() => {
-    if (isMultiLayerFeeNetwork) {
-      fetchEstimatedL1Fee(txData?.chainId, txData)
-        .then((result) => {
-          setEstimatedL1Fees(result);
-        })
-        .catch((_err) => {
-          setEstimatedL1Fees(null);
-        });
-    }
-  }, [isMultiLayerFeeNetwork, txData]);
+  const { layer1GasFee } = txData;
 
   const draftTransaction = useSelector(getCurrentDraftTransaction);
   const transactionData = useDraftTransactionWithTxParams();
@@ -64,30 +57,32 @@ const GasDetailsItem = ({
   const {
     estimateUsed,
     hasSimulationError,
+    isNetworkBusy,
     maximumCostInHexWei: hexMaximumTransactionFee,
     minimumCostInHexWei: hexMinimumTransactionFee,
     maxPriorityFeePerGas,
     maxFeePerGas,
+    supportsEIP1559,
   } = useGasFeeContext();
 
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
 
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const getTransactionFeeTotal = useMemo(() => {
-    if (isMultiLayerFeeNetwork) {
-      return sumHexes(hexMinimumTransactionFee, estimatedL1Fees || 0);
+    if (layer1GasFee) {
+      return sumHexes(hexMinimumTransactionFee, layer1GasFee);
     }
 
     return hexMinimumTransactionFee;
-  }, [isMultiLayerFeeNetwork, hexMinimumTransactionFee, estimatedL1Fees]);
+  }, [hexMinimumTransactionFee, layer1GasFee]);
 
   const getMaxTransactionFeeTotal = useMemo(() => {
-    if (isMultiLayerFeeNetwork) {
-      return sumHexes(hexMaximumTransactionFee, estimatedL1Fees || 0);
+    if (layer1GasFee) {
+      return sumHexes(hexMaximumTransactionFee, layer1GasFee);
     }
 
     return hexMaximumTransactionFee;
-  }, [isMultiLayerFeeNetwork, hexMaximumTransactionFee, estimatedL1Fees]);
+  }, [hexMaximumTransactionFee, layer1GasFee]);
 
   if (hasSimulationError && !userAcknowledgedGasMissing) {
     return null;
@@ -103,11 +98,31 @@ const GasDetailsItem = ({
     hexWEIToDecGWEI(transactionData.txParams?.maxFeePerGas ?? '0x0')
   ).toString();
 
+  const detailTitle = () => {
+    if (supportsEIP1559 && isNetworkBusy) {
+      return (
+        <>
+          <Text>{t('estimatedFee')}</Text>
+          <Tooltip interactive position="top" html={t('networkIsBusy')}>
+            &nbsp;&nbsp;
+            <Icon
+              data-testid="network-busy-tooltip"
+              name={IconName.Danger}
+              size={IconSize.Sm}
+              color={IconColor.errorDefault}
+              marginTop={2}
+            />
+          </Tooltip>
+        </>
+      );
+    }
+    return <Text>{t('estimatedFee')}</Text>;
+  };
   return (
     <TransactionDetailItem
       key="gas-details-item"
       data-testid={dataTestId}
-      detailTitle={<Text>{t('estimatedFee')}</Text>}
+      detailTitle={detailTitle()}
       detailTitleColor={TextColor.textDefault}
       detailText={
         Object.keys(draftTransaction).length === 0 && (
diff --git a/ui/pages/confirmations/components/gas-details-item/gas-details-item.test.js b/ui/pages/confirmations/components/gas-details-item/gas-details-item.test.js
index 60f0cba4d7b5..b7cf9568aa1e 100644
--- a/ui/pages/confirmations/components/gas-details-item/gas-details-item.test.js
+++ b/ui/pages/confirmations/components/gas-details-item/gas-details-item.test.js
@@ -8,6 +8,7 @@ import { GasFeeContextProvider } from '../../../../contexts/gasFee';
 import { renderWithProvider } from '../../../../../test/jest';
 import configureStore from '../../../../store/store';
 
+import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
 import GasDetailsItem from './gas-details-item';
 
 jest.mock('../../../../store/actions', () => ({
@@ -21,13 +22,16 @@ jest.mock('../../../../store/actions', () => ({
   getGasFeeTimeEstimate: jest.fn().mockImplementation(() => Promise.resolve()),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async ({ contextProps } = {}) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
@@ -203,4 +207,89 @@ describe('GasDetailsItem', () => {
       expect(screen.queryAllByText('ETH').length).toBeGreaterThan(0);
     });
   });
+
+  it('does not render icon if network is not busy', async () => {
+    await render();
+    await waitFor(() => {
+      expect(
+        screen.queryByTestId('network-busy-tooltip'),
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  it('does not render icon if txParams.type is set to 0x0', async () => {
+    await render({
+      contextProps: {
+        gasFeeEstimates: {
+          high: {
+            suggestedMaxPriorityFeePerGas: '1',
+          },
+        },
+        gasFeeEstimatesByChainId: {
+          ...mockState.metamask.gasFeeEstimatesByChainId,
+          '0x5': {
+            gasFeeEstimates: {
+              high: {
+                suggestedMaxPriorityFeePerGas: '1',
+              },
+              networkCongestion: 0.7,
+            },
+          },
+        },
+        transaction: {
+          txParams: {
+            type: '0x0',
+          },
+          userFeeLevel: 'medium',
+          dappSuggestedGasFees: {
+            maxPriorityFeePerGas: '0x38D7EA4C68000',
+            maxFeePerGas: '0x38D7EA4C68000',
+          },
+        },
+      },
+    });
+    await waitFor(() => {
+      expect(
+        screen.queryByTestId('network-busy-tooltip'),
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  it('renders icon if network is busy', async () => {
+    await render({
+      contextProps: {
+        gasFeeEstimates: {
+          high: {
+            suggestedMaxPriorityFeePerGas: '1',
+          },
+        },
+        gasFeeEstimatesByChainId: {
+          ...mockState.metamask.gasFeeEstimatesByChainId,
+          '0x5': {
+            gasFeeEstimates: {
+              high: {
+                suggestedMaxPriorityFeePerGas: '1',
+              },
+              networkCongestion: 0.7,
+            },
+          },
+        },
+        transaction: {
+          txParams: {
+            gas: '0x52081',
+            maxFeePerGas: '0x38D7EA4C68000',
+          },
+          userFeeLevel: 'medium',
+          dappSuggestedGasFees: {
+            maxPriorityFeePerGas: '0x38D7EA4C68000',
+            maxFeePerGas: '0x38D7EA4C68000',
+          },
+        },
+      },
+    });
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('network-busy-tooltip')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/ui/pages/confirmations/components/index.scss b/ui/pages/confirmations/components/index.scss
index f520b7691d39..10bf10d15bfd 100644
--- a/ui/pages/confirmations/components/index.scss
+++ b/ui/pages/confirmations/components/index.scss
@@ -7,15 +7,13 @@
 @import 'advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index';
 @import 'advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index';
 @import 'advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index';
-@import 'alerts/inline-alert/index';
 @import 'approve-content-card/index';
 @import 'confirmation-warning-modal/index';
 @import 'confirm-page-container/index';
-///: BEGIN:ONLY_INCLUDE_IF(conf-redesign)
+@import 'confirm/footer';
 @import 'confirm/header/header.scss';
 @import 'confirm/scroll-to-bottom';
 @import 'confirm/nav/nav.scss';
-///: END:ONLY_INCLUDE_IF
 @import 'contract-details-modal/index';
 @import 'custom-nonce/index';
 @import 'edit-gas-display/index';
diff --git a/ui/pages/confirmations/components/multilayer-fee-message/__snapshots__/multi-layer-fee-message.test.js.snap b/ui/pages/confirmations/components/multilayer-fee-message/__snapshots__/multi-layer-fee-message.test.js.snap
index 13bc77081404..0e65b25f132c 100644
--- a/ui/pages/confirmations/components/multilayer-fee-message/__snapshots__/multi-layer-fee-message.test.js.snap
+++ b/ui/pages/confirmations/components/multilayer-fee-message/__snapshots__/multi-layer-fee-message.test.js.snap
@@ -22,7 +22,7 @@ exports[`Multi layer fee message when balance and token price checker is disable
           <h6
             class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-text--text-align-right mm-box--margin-left-1 mm-box--color-text-default"
           >
-            Unknown
+            0.000000003000 ETH
           </h6>
         </div>
       </div>
@@ -54,7 +54,7 @@ exports[`Multi layer fee message when balance and token price checker is disable
           <h6
             class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-text--text-align-right mm-box--margin-left-1 mm-box--color-text-default"
           >
-            0.001000021000 ETH
+            0.001000024000 ETH
           </h6>
         </div>
       </div>
@@ -97,12 +97,21 @@ exports[`Multi layer fee message when balance and token price checker is enabled
           <h6
             class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
           >
-            Unknown
+            <div
+              class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+              title="$0.00"
+            >
+              <span
+                class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
+              >
+                $0.00
+              </span>
+            </div>
           </h6>
           <h6
             class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-text--text-align-right mm-box--margin-left-1 mm-box--color-text-default"
           >
-            Unknown
+            0.000000003000 ETH
           </h6>
         </div>
       </div>
@@ -148,7 +157,7 @@ exports[`Multi layer fee message when balance and token price checker is enabled
           <h6
             class="mm-box mm-text mm-text--body-md mm-text--font-weight-bold mm-text--text-align-right mm-box--margin-left-1 mm-box--color-text-default"
           >
-            0.001000021000 ETH
+            0.001000024000 ETH
           </h6>
         </div>
       </div>
diff --git a/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.js b/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.js
index d033d069e66e..a7133771d338 100644
--- a/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.js
+++ b/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.js
@@ -1,10 +1,8 @@
-import React, { useContext, useState, useEffect } from 'react';
+import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { captureException } from '@sentry/browser';
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
 import UserPreferencedCurrencyDisplay from '../../../../components/app/user-preferenced-currency-display';
-import fetchEstimatedL1Fee from '../../../../helpers/utils/optimism/fetchEstimatedL1Fee';
 import { SECONDARY } from '../../../../helpers/constants/common';
 import { I18nContext } from '../../../../contexts/i18n';
 import { sumHexes } from '../../../../../shared/modules/conversion.utils';
@@ -19,29 +17,10 @@ export default function MultilayerFeeMessage({
   plainStyle,
 }) {
   const t = useContext(I18nContext);
-  const [fetchedLayer1Total, setLayer1Total] = useState(null);
+  const { layer1GasFee } = transaction;
 
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
 
-  useEffect(() => {
-    if (!transaction?.txParams) {
-      return;
-    }
-    const getEstimatedL1Fee = async () => {
-      try {
-        const result = await fetchEstimatedL1Fee(
-          transaction?.chainId,
-          transaction,
-        );
-        setLayer1Total(result);
-      } catch (e) {
-        captureException(e);
-        setLayer1Total(null);
-      }
-    };
-    getEstimatedL1Fee();
-  }, [transaction]);
-
   if (!transaction?.txParams) {
     return null;
   }
@@ -49,12 +28,8 @@ export default function MultilayerFeeMessage({
   let layer1Total = t('unknown');
   let feeTotalInFiat = t('unknown');
 
-  if (fetchedLayer1Total !== null) {
-    const layer1TotalBN = new Numeric(
-      fetchedLayer1Total,
-      16,
-      EtherDenomination.WEI,
-    );
+  if (layer1GasFee) {
+    const layer1TotalBN = new Numeric(layer1GasFee, 16, EtherDenomination.WEI);
     layer1Total = `${layer1TotalBN
       .toDenomination(EtherDenomination.ETH)
       .toFixed(12)} ${nativeCurrency}`;
@@ -62,7 +37,7 @@ export default function MultilayerFeeMessage({
     feeTotalInFiat = useCurrencyRateCheck ? (
       <UserPreferencedCurrencyDisplay
         type={SECONDARY}
-        value={fetchedLayer1Total}
+        value={layer1GasFee}
         showFiat
         hideLabel
       />
@@ -71,7 +46,7 @@ export default function MultilayerFeeMessage({
 
   const totalInWeiHex = sumHexes(
     layer2fee || '0x0',
-    fetchedLayer1Total || '0x0',
+    layer1GasFee || '0x0',
     transaction?.txParams?.value || '0x0',
   );
 
diff --git a/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.test.js b/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.test.js
index 7458163bed0d..42f28d3f980b 100644
--- a/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.test.js
+++ b/ui/pages/confirmations/components/multilayer-fee-message/multi-layer-fee-message.test.js
@@ -1,14 +1,25 @@
 import React from 'react';
 
+import { toHex } from '@metamask/controller-utils';
 import mockState from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import configureStore from '../../../../store/store';
 import MultilayerFeeMessage from './multi-layer-fee-message';
 
-jest.mock(
-  '../../../../helpers/utils/optimism/fetchEstimatedL1Fee',
-  () => '0x5',
-);
+const VALUE_MOCK_DECIMAL = 1e15;
+const LAYER_2_FEE_MOCK_DECIMAL = 21000000000;
+const LAYER_1_FEE_MOCK_DECIMAL = 3000000000;
+
+const VALUE_MOCK_HEX = toHex(VALUE_MOCK_DECIMAL);
+const LAYER_2_FEE_MOCK_HEX = toHex(LAYER_2_FEE_MOCK_DECIMAL);
+const LAYER_1_FEE_MOCK_HEX = toHex(LAYER_1_FEE_MOCK_DECIMAL);
+
+const TRANSACTION_META_MOCK = {
+  txParams: {
+    value: VALUE_MOCK_HEX,
+  },
+  layer1GasFee: LAYER_1_FEE_MOCK_HEX,
+};
 
 describe('Multi layer fee message', () => {
   describe('when balance and token price checker is enabled', () => {
@@ -25,12 +36,8 @@ describe('Multi layer fee message', () => {
     it('should match snapshot', () => {
       const { container } = renderWithProvider(
         <MultilayerFeeMessage
-          transaction={{
-            txParams: {
-              value: '0x38d7ea4c68000',
-            },
-          }}
-          layer2fee="0x4e3b29200"
+          transaction={TRANSACTION_META_MOCK}
+          layer2fee={LAYER_2_FEE_MOCK_HEX}
           nativeCurrency="ETH"
         />,
         store,
@@ -41,19 +48,18 @@ describe('Multi layer fee message', () => {
     it('should contain fee values', () => {
       const { getByText } = renderWithProvider(
         <MultilayerFeeMessage
-          transaction={{
-            txParams: {
-              value: '0x38d7ea4c68000',
-            },
-          }}
-          layer2fee="0x4e3b29200"
+          transaction={TRANSACTION_META_MOCK}
+          layer2fee={LAYER_2_FEE_MOCK_HEX}
           nativeCurrency="ETH"
         />,
         store,
       );
+
       expect(getByText('Layer 1 fees')).toBeInTheDocument();
+      expect(getByText('0.000000003000 ETH')).toBeInTheDocument();
+
       expect(getByText('Amount + fees')).toBeInTheDocument();
-      expect(getByText('0.001000021000 ETH')).toBeInTheDocument();
+      expect(getByText('0.001000024000 ETH')).toBeInTheDocument();
       expect(getByText('$0.56')).toBeInTheDocument();
     });
   });
@@ -78,12 +84,8 @@ describe('Multi layer fee message', () => {
     it('should match screenshot', () => {
       const { container } = renderWithProvider(
         <MultilayerFeeMessage
-          transaction={{
-            txParams: {
-              value: '0x38d7ea4c68000',
-            },
-          }}
-          layer2fee="0x4e3b29200"
+          transaction={TRANSACTION_META_MOCK}
+          layer2fee={LAYER_2_FEE_MOCK_HEX}
           nativeCurrency="ETH"
         />,
         storeWithPriceCheckerDisabled,
@@ -94,12 +96,8 @@ describe('Multi layer fee message', () => {
     it('should not contain a fiat value', () => {
       const { queryByText } = renderWithProvider(
         <MultilayerFeeMessage
-          transaction={{
-            txParams: {
-              value: '0x38d7ea4c68000',
-            },
-          }}
-          layer2fee="0x4e3b29200"
+          transaction={TRANSACTION_META_MOCK}
+          layer2fee={LAYER_2_FEE_MOCK_HEX}
           nativeCurrency="ETH"
         />,
         storeWithPriceCheckerDisabled,
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap b/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
index 7a17475bdde3..51275b376b09 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
@@ -24,47 +24,51 @@ exports[`Security Provider Banner Alert should match snapshot 1`] = `
         This is a description to warn the user of malicious or suspicious transactions.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              [seeDetails]
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <ul>
-              <li>
-                List item
-              </li>
-              <li>
-                List item
-              </li>
-              <li>
-                List item
-              </li>
-            </ul>
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                [seeDetails]
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              [somethingDoesntLookRight]
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <ul>
+                <li>
+                  List item
+                </li>
+                <li>
+                  List item
+                </li>
+                <li>
+                  List item
+                </li>
+              </ul>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                [somethingDoesntLookRight]
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -104,36 +108,40 @@ exports[`Security Provider Banner Alert should render disclosure component if no
         This is a description to warn the user of malicious or suspicious transactions.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              [seeDetails]
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                [seeDetails]
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              [somethingDoesntLookRight]
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                [somethingDoesntLookRight]
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
index a1bb005292cb..9adae93219af 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
@@ -23,49 +23,53 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <div
-      class="disclosure"
-      data-testid="disclosure"
+      class="mm-box mm-box--margin-top-3"
     >
-      <details>
-        <summary
-          class="disclosure__summary is-arrow"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+      <div
+        class="disclosure"
+        data-testid="disclosure"
+      >
+        <details>
+          <summary
+            class="disclosure__summary is-arrow"
           >
-            See details
-          </p>
-          <span
-            class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-            style="mask-image: url('./images/icons/arrow-up.svg');"
-          />
-        </summary>
-        <div
-          class="disclosure__content normal"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+            >
+              See details
+            </p>
+            <span
+              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+              style="mask-image: url('./images/icons/arrow-up.svg');"
+            />
+          </summary>
+          <div
+            class="disclosure__content normal"
           >
-            <span>
-               
-              Something doesn't look right? 
-              <a
-                class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                Report an issue
-              </a>
-              
-               
-            </span>
-          </p>
-        </div>
-        <div
-          class="disclosure__footer"
-        />
-      </details>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            >
+              <span>
+                 
+                Something doesn't look right? 
+                <a
+                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Report an issue
+                </a>
+                
+                 
+              </span>
+            </p>
+          </div>
+          <div
+            class="disclosure__footer"
+          />
+        </details>
+      </div>
     </div>
     <p
       class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -116,49 +120,53 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <div
-      class="disclosure"
-      data-testid="disclosure"
+      class="mm-box mm-box--margin-top-3"
     >
-      <details>
-        <summary
-          class="disclosure__summary is-arrow"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+      <div
+        class="disclosure"
+        data-testid="disclosure"
+      >
+        <details>
+          <summary
+            class="disclosure__summary is-arrow"
           >
-            See details
-          </p>
-          <span
-            class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-            style="mask-image: url('./images/icons/arrow-up.svg');"
-          />
-        </summary>
-        <div
-          class="disclosure__content normal"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+            >
+              See details
+            </p>
+            <span
+              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+              style="mask-image: url('./images/icons/arrow-up.svg');"
+            />
+          </summary>
+          <div
+            class="disclosure__content normal"
           >
-            <span>
-               
-              Something doesn't look right? 
-              <a
-                class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                Report an issue
-              </a>
-              
-               
-            </span>
-          </p>
-        </div>
-        <div
-          class="disclosure__footer"
-        />
-      </details>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            >
+              <span>
+                 
+                Something doesn't look right? 
+                <a
+                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Report an issue
+                </a>
+                
+                 
+              </span>
+            </p>
+          </div>
+          <div
+            class="disclosure__footer"
+          />
+        </details>
+      </div>
     </div>
     <p
       class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -209,49 +217,53 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <div
-      class="disclosure"
-      data-testid="disclosure"
+      class="mm-box mm-box--margin-top-3"
     >
-      <details>
-        <summary
-          class="disclosure__summary is-arrow"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+      <div
+        class="disclosure"
+        data-testid="disclosure"
+      >
+        <details>
+          <summary
+            class="disclosure__summary is-arrow"
           >
-            See details
-          </p>
-          <span
-            class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-            style="mask-image: url('./images/icons/arrow-up.svg');"
-          />
-        </summary>
-        <div
-          class="disclosure__content normal"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+            >
+              See details
+            </p>
+            <span
+              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+              style="mask-image: url('./images/icons/arrow-up.svg');"
+            />
+          </summary>
+          <div
+            class="disclosure__content normal"
           >
-            <span>
-               
-              Something doesn't look right? 
-              <a
-                class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                Report an issue
-              </a>
-              
-               
-            </span>
-          </p>
-        </div>
-        <div
-          class="disclosure__footer"
-        />
-      </details>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+            >
+              <span>
+                 
+                Something doesn't look right? 
+                <a
+                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Report an issue
+                </a>
+                
+                 
+              </span>
+            </p>
+          </div>
+          <div
+            class="disclosure__footer"
+          />
+        </details>
+      </div>
     </div>
     <p
       class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -303,49 +315,53 @@ exports[`Blockaid Banner Alert should render details section even when features
         If you approve this request, a third party known for scams might take all your assets.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              See details
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                See details
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              <span>
-                 
-                Something doesn't look right? 
-                <a
-                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Report an issue
-                </a>
-                
-                 
-              </span>
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                <span>
+                   
+                  Something doesn't look right? 
+                  <a
+                    class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Report an issue
+                  </a>
+                  
+                   
+                </span>
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -398,61 +414,65 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
         If you approve this request, a third party known for scams might take all your assets.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
-            >
-              See details
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <ul
-              class="mm-box mm-text mm-text--body-md mm-text--overflow-wrap-break-word mm-box--color-text-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              <li>
-                • 
-                Operator is an EOA
-              </li>
-              <li>
-                • 
-                Operator is untrusted according to previous activity
-              </li>
-            </ul>
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                See details
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              <span>
-                 
-                Something doesn't look right? 
-                <a
-                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%2C%22reproduce%22%3A%22%5B%5C%22Operator%20is%20an%20EOA%5C%22%2C%5C%22Operator%20is%20untrusted%20according%20to%20previous%20activity%5C%22%5D%22%7D&utm_source=metamask-ppom"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Report an issue
-                </a>
-                
-                 
-              </span>
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <ul
+                class="mm-box mm-text mm-text--body-md mm-text--overflow-wrap-break-word mm-box--color-text-default"
+              >
+                <li>
+                  • 
+                  Operator is an EOA
+                </li>
+                <li>
+                  • 
+                  Operator is untrusted according to previous activity
+                </li>
+              </ul>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                <span>
+                   
+                  Something doesn't look right? 
+                  <a
+                    class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%2C%22reproduce%22%3A%22%5B%5C%22Operator%20is%20an%20EOA%5C%22%2C%5C%22Operator%20is%20untrusted%20according%20to%20previous%20activity%5C%22%5D%22%7D&utm_source=metamask-ppom"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Report an issue
+                  </a>
+                  
+                   
+                </span>
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
@@ -505,49 +525,53 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
         If you approve this request, a third party known for scams might take all your assets.
       </p>
       <div
-        class="disclosure"
-        data-testid="disclosure"
+        class="mm-box mm-box--margin-top-3"
       >
-        <details>
-          <summary
-            class="disclosure__summary is-arrow"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        <div
+          class="disclosure"
+          data-testid="disclosure"
+        >
+          <details>
+            <summary
+              class="disclosure__summary is-arrow"
             >
-              See details
-            </p>
-            <span
-              class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
-              style="mask-image: url('./images/icons/arrow-up.svg');"
-            />
-          </summary>
-          <div
-            class="disclosure__content normal"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+              >
+                See details
+              </p>
+              <span
+                class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-start-2 mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/arrow-up.svg');"
+              />
+            </summary>
+            <div
+              class="disclosure__content normal"
             >
-              <span>
-                 
-                Something doesn't look right? 
-                <a
-                  class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Report an issue
-                </a>
-                
-                 
-              </span>
-            </p>
-          </div>
-          <div
-            class="disclosure__footer"
-          />
-        </details>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--margin-top-3 mm-box--display-flex mm-box--color-text-default"
+              >
+                <span>
+                   
+                  Something doesn't look right? 
+                  <a
+                    class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Report an issue
+                  </a>
+                  
+                   
+                </span>
+              </p>
+            </div>
+            <div
+              class="disclosure__footer"
+            />
+          </details>
+        </div>
       </div>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
index d60c90e0138e..b6f2dc5af398 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
@@ -5,17 +5,17 @@ import BlockaidPackage from '@blockaid/ppom_release/package.json';
 
 import { useSelector } from 'react-redux';
 import { NETWORK_TO_NAME_MAP } from '../../../../../../shared/constants/network';
-import {
-  OverflowWrap,
-  Severity,
-} from '../../../../../helpers/constants/design-system';
+import { OverflowWrap } from '../../../../../helpers/constants/design-system';
 import { I18nContext } from '../../../../../contexts/i18n';
 import {
   BlockaidReason,
   BlockaidResultType,
   SecurityProvider,
 } from '../../../../../../shared/constants/security-provider';
-import { Text } from '../../../../../components/component-library';
+import {
+  BannerAlertSeverity,
+  Text,
+} from '../../../../../components/component-library';
 import { useTransactionEventFragment } from '../../../hooks/useTransactionEventFragment';
 
 import SecurityProviderBannerAlert from '../security-provider-banner-alert';
@@ -70,7 +70,12 @@ function BlockaidBannerAlert({ txData, ...props }) {
   ) {
     return null;
   } else if (securityAlertResponse.reason === 'loading') {
-    return <LoadingIndicator isLoading />;
+    return (
+      <LoadingIndicator
+        isLoading
+        style={{ position: 'relative', flex: '0 0 auto', margin: '8px auto 0' }}
+      />
+    );
   }
 
   const {
@@ -104,8 +109,8 @@ function BlockaidBannerAlert({ txData, ...props }) {
 
   const severity =
     resultType === BlockaidResultType.Malicious
-      ? Severity.Danger
-      : Severity.Warning;
+      ? BannerAlertSeverity.Danger
+      : BannerAlertSeverity.Warning;
 
   const title = t(REASON_TO_TITLE_TKEY[reason] || 'blockaidTitleDeceptive');
 
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js
index 9880a24a505f..9b0148f281b7 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js
@@ -154,7 +154,7 @@ describe('Blockaid Banner Alert', () => {
       configureStore(),
     );
 
-    expect(getByText('Request may not be safe')).toBeInTheDocument();
+    expect(getByText('Be careful')).toBeInTheDocument();
   });
 
   it(`should render title, "This is a suspicious request", when the reason is "${BlockaidReason.rawSignatureFarming}"`, () => {
@@ -278,7 +278,7 @@ describe('Blockaid Banner Alert', () => {
       [BlockaidReason.blurFarming]:
         'If you approve this request, someone can steal your assets listed on Blur.',
       [BlockaidReason.errored]:
-        'Because of an error, this request was not verified by the security provider. Proceed with caution.',
+        "Because of an error, we couldn't check for security alerts. Only continue if you trust every address involved.",
       [BlockaidReason.maliciousDomain]:
         "You're interacting with a malicious domain. If you approve this request, you might lose your assets.",
       [BlockaidReason.other]:
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js b/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
index 24bac8a8f12d..5b454bee1225 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/security-provider-banner-alert.js
@@ -2,6 +2,7 @@ import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import {
   BannerAlert,
+  Box,
   ButtonLink,
   Icon,
   IconName,
@@ -49,22 +50,24 @@ function SecurityProviderBannerAlert({
     >
       <Text marginTop={2}>{description}</Text>
 
-      <Disclosure title={t('seeDetails')} variant={DisclosureVariant.Arrow}>
-        {details}
-        <Text marginTop={3} display={Display.Flex}>
-          {t('somethingDoesntLookRight', [
-            <ButtonLink
-              key={`security-provider-button-supporturl-${provider}`}
-              size={Size.inherit}
-              href={reportUrl || ZENDESK_URLS.SUPPORT_URL}
-              externalLink
-              onClick={onClickSupportLink}
-            >
-              {t('reportIssue')}
-            </ButtonLink>,
-          ])}
-        </Text>
-      </Disclosure>
+      <Box marginTop={3}>
+        <Disclosure title={t('seeDetails')} variant={DisclosureVariant.Arrow}>
+          {details}
+          <Text marginTop={3} display={Display.Flex}>
+            {t('somethingDoesntLookRight', [
+              <ButtonLink
+                key={`security-provider-button-supporturl-${provider}`}
+                size={Size.inherit}
+                href={reportUrl || ZENDESK_URLS.SUPPORT_URL}
+                externalLink
+                onClick={onClickSupportLink}
+              >
+                {t('reportIssue')}
+              </ButtonLink>,
+            ])}
+          </Text>
+        </Disclosure>
+      </Box>
 
       {provider && (
         <Text
diff --git a/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap b/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap
index 29cf93feca5f..005650a69853 100644
--- a/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap
@@ -57,6 +57,7 @@ exports[`SignatureRequestHeader should match snapshot 1`] = `
         </div>
         <div
           class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+          style="height: 16px; width: 16px;"
         >
           <span
             class="icon-with-fallback__fallback"
diff --git a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
index ad527ef84ddf..397ee6f14ffd 100644
--- a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
@@ -133,6 +133,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
             </div>
             <div
               class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+              style="height: 16px; width: 16px;"
             >
               <span
                 class="icon-with-fallback__fallback"
@@ -193,6 +194,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
             >
               <div
                 class=""
+                style="height: 24px; width: 24px;"
               >
                 <span
                   class="icon-with-fallback__fallback"
diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
index efbf2399575c..08fe9b727889 100644
--- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
+++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js
@@ -26,7 +26,6 @@ import {
   TextAlign,
   TextColor,
   Size,
-  Severity,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   IconColor,
   Display,
@@ -37,7 +36,6 @@ import {
 } from '../../../../helpers/constants/design-system';
 import {
   ButtonLink,
-  BannerAlert,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   Box,
   Icon,
@@ -56,11 +54,10 @@ import SecurityProviderBannerMessage from '../security-provider-banner-message/s
 import SignatureRequestHeader from '../signature-request-header';
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import SnapLegacyAuthorshipHeader from '../../../../components/app/snaps/snap-legacy-authorship-header';
-///: END:ONLY_INCLUDE_IF
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
 import InsightWarnings from '../../../../components/app/snaps/insight-warnings';
 ///: END:ONLY_INCLUDE_IF
 import { BlockaidResultType } from '../../../../../shared/constants/security-provider';
+import { BlockaidUnavailableBannerAlert } from '../blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert';
 import SignatureRequestOriginalWarning from './signature-request-original-warning';
 
 export default class SignatureRequestOriginal extends Component {
@@ -87,24 +84,20 @@ export default class SignatureRequestOriginal extends Component {
     mostRecentOverviewPage: PropTypes.string.isRequired,
     resolvePendingApproval: PropTypes.func.isRequired,
     completedTx: PropTypes.func.isRequired,
-    hasMigratedFromOpenSeaToBlockaid: PropTypes.bool.isRequired,
-    isNetworkSupportedByBlockaid: PropTypes.bool.isRequired,
-    hasDismissedOpenSeaToBlockaidBanner: PropTypes.bool.isRequired,
-    dismissOpenSeaToBlockaidBanner: PropTypes.func.isRequired,
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     // Used to show a warning if the signing account is not the selected account
     // Largely relevant for contract wallet custodians
     selectedAccount: PropTypes.object,
     mmiOnSignCallback: PropTypes.func,
     ///: END:ONLY_INCLUDE_IF
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    ///: BEGIN:ONLY_INCLUDE_IF(snaps)
     warnings: PropTypes.array,
     ///: END:ONLY_INCLUDE_IF
   };
 
   state = {
     showSignatureRequestWarning: false,
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    ///: BEGIN:ONLY_INCLUDE_IF(snaps)
     showSignatureInsights: false,
     ///: END:ONLY_INCLUDE_IF
   };
@@ -135,8 +128,6 @@ export default class SignatureRequestOriginal extends Component {
   };
 
   renderBody = () => {
-    const { t } = this.context;
-
     let rows;
     const notice = `${this.context.t('youSign')}:`;
 
@@ -158,25 +149,16 @@ export default class SignatureRequestOriginal extends Component {
       ? subjectMetadata?.[txData.msgParams.origin]
       : null;
 
-    const {
-      hasMigratedFromOpenSeaToBlockaid,
-      isNetworkSupportedByBlockaid,
-      hasDismissedOpenSeaToBlockaidBanner,
-      dismissOpenSeaToBlockaidBanner,
-    } = this.props;
-    const showOpenSeaToBlockaidBannerAlert =
-      hasMigratedFromOpenSeaToBlockaid &&
-      !isNetworkSupportedByBlockaid &&
-      !hasDismissedOpenSeaToBlockaidBanner;
-    const handleCloseOpenSeaToBlockaidBannerAlert = () => {
-      dismissOpenSeaToBlockaidBanner();
-    };
-
     return (
       <div className="request-signature__body">
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={4} />
+          <BlockaidBannerAlert
+            txData={txData}
+            marginTop={4}
+            marginLeft={4}
+            marginRight={4}
+          />
           ///: END:ONLY_INCLUDE_IF
         }
         {isSuspiciousResponse(txData?.securityProviderResponse) && (
@@ -184,30 +166,14 @@ export default class SignatureRequestOriginal extends Component {
             securityProviderResponse={txData.securityProviderResponse}
           />
         )}
-        {showOpenSeaToBlockaidBannerAlert ? (
-          <BannerAlert
-            severity={Severity.Info}
-            title={t('openSeaToBlockaidTitle')}
-            description={t('openSeaToBlockaidDescription')}
-            actionButtonLabel={t('openSeaToBlockaidBtnLabel')}
-            actionButtonProps={{
-              href: 'https://snaps.metamask.io/transaction-insights',
-              externalLink: true,
-            }}
-            marginBottom={4}
-            marginLeft={4}
-            marginTop={4}
-            marginRight={4}
-            onClose={handleCloseOpenSeaToBlockaidBannerAlert}
-          />
-        ) : null}
+        <BlockaidUnavailableBannerAlert />
         {
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           this.props.selectedAccount.address ===
           this.props.fromAccount.address ? null : (
             <Box
               className="request-signature__mismatch-info"
-              Display={Display.Flex}
+              display={Display.Flex}
               width={BlockSize.Full}
               padding={4}
               marginBottom={4}
@@ -345,7 +311,7 @@ export default class SignatureRequestOriginal extends Component {
       txData,
       hardwareWalletRequiresConnection,
       rejectPendingApproval,
-      ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+      ///: BEGIN:ONLY_INCLUDE_IF(snaps)
       warnings,
       ///: END:ONLY_INCLUDE_IF
     } = this.props;
@@ -371,7 +337,7 @@ export default class SignatureRequestOriginal extends Component {
           if (txData.type === MESSAGE_TYPE.ETH_SIGN) {
             return this.setState({ showSignatureRequestWarning: true });
           }
-          ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+          ///: BEGIN:ONLY_INCLUDE_IF(snaps)
           if (warnings?.length >= 1) {
             return this.setState({ showSignatureInsights: true });
           }
@@ -415,7 +381,7 @@ export default class SignatureRequestOriginal extends Component {
       messagesCount,
       fromAccount: { address, name },
       txData,
-      ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+      ///: BEGIN:ONLY_INCLUDE_IF(snaps)
       warnings,
       ///: END:ONLY_INCLUDE_IF
     } = this.props;
@@ -443,7 +409,7 @@ export default class SignatureRequestOriginal extends Component {
             senderAddress={address}
             name={name}
             onSubmit={async () => {
-              ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+              ///: BEGIN:ONLY_INCLUDE_IF(snaps)
               if (warnings?.length >= 1) {
                 return this.setState({
                   showSignatureInsights: true,
@@ -457,7 +423,7 @@ export default class SignatureRequestOriginal extends Component {
           />
         )}
         {
-          ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+          ///: BEGIN:ONLY_INCLUDE_IF(snaps)
         }
         {this.state.showSignatureInsights && (
           <InsightWarnings
diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.container.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.container.js
index 2c671a10f94a..0d0b981c7409 100644
--- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.container.js
+++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.container.js
@@ -8,7 +8,6 @@ import {
   rejectPendingApproval,
   rejectAllMessages,
   completedTx,
-  dismissOpenSeaToBlockaidBanner,
 } from '../../../../store/actions';
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 // eslint-disable-next-line import/order
@@ -23,9 +22,6 @@ import {
   doesAddressRequireLedgerHidConnection,
   unconfirmedMessagesHashSelector,
   getTotalUnapprovedMessagesCount,
-  getIsNetworkSupportedByBlockaid,
-  getHasDismissedOpenSeaToBlockaidBanner,
-  getHasMigratedFromOpenSeaToBlockaid,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   getAccountType,
   getSelectedInternalAccount,
@@ -48,12 +44,6 @@ function mapStateToProps(state, ownProps) {
   const messagesList = unconfirmedMessagesHashSelector(state);
   const messagesCount = getTotalUnapprovedMessagesCount(state);
 
-  const hasMigratedFromOpenSeaToBlockaid =
-    getHasMigratedFromOpenSeaToBlockaid(state);
-  const hasDismissedOpenSeaToBlockaidBanner =
-    getHasDismissedOpenSeaToBlockaidBanner(state);
-  const isNetworkSupportedByBlockaid = getIsNetworkSupportedByBlockaid(state);
-
   return {
     requester: null,
     requesterAddress: null,
@@ -65,9 +55,6 @@ function mapStateToProps(state, ownProps) {
     subjectMetadata: getSubjectMetadata(state),
     messagesList,
     messagesCount,
-    hasMigratedFromOpenSeaToBlockaid,
-    hasDismissedOpenSeaToBlockaidBanner,
-    isNetworkSupportedByBlockaid,
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     accountType: getAccountType(state),
     selectedAccount: getSelectedInternalAccount(state),
@@ -103,8 +90,6 @@ mapDispatchToProps = function (dispatch) {
     cancelAllApprovals: (messagesList) => {
       dispatch(rejectAllMessages(messagesList));
     },
-    dismissOpenSeaToBlockaidBanner: () =>
-      dispatch(dismissOpenSeaToBlockaidBanner()),
   };
 };
 
diff --git a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
index e3f0aa6ada26..b962fa7a9d6e 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
@@ -130,6 +130,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
           </div>
           <div
             class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+            style="height: 16px; width: 16px;"
           >
             <span
               class="icon-with-fallback__fallback"
@@ -192,6 +193,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
               >
                 <div
                   class=""
+                  style="height: 24px; width: 24px;"
                 >
                   <img
                     alt="icon"
diff --git a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
index e898fb8b03c0..2d2470f7ed09 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
+++ b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.js
@@ -44,7 +44,7 @@ import BlockaidBannerAlert from '../security-provider-banner-alert/blockaid-bann
 import LedgerInstructionField from '../ledger-instruction-field';
 
 import SignatureRequestHeader from '../signature-request-header';
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import InsightWarnings from '../../../../components/app/snaps/insight-warnings';
 ///: END:ONLY_INCLUDE_IF
 import { BlockaidResultType } from '../../../../../shared/constants/security-provider';
@@ -53,7 +53,7 @@ import Message from './signature-request-siwe-message';
 
 export default function SignatureRequestSIWE({
   txData,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   warnings,
   ///: END:ONLY_INCLUDE_IF
 }) {
@@ -93,7 +93,7 @@ export default function SignatureRequestSIWE({
     txData?.securityProviderResponse,
   );
 
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   const [isShowingSigInsightWarnings, setIsShowingSigInsightWarnings] =
     useState(false);
   ///: END:ONLY_INCLUDE_IF
@@ -153,7 +153,12 @@ export default function SignatureRequestSIWE({
         <SignatureRequestHeader txData={txData} />
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={4} />
+          <BlockaidBannerAlert
+            txData={txData}
+            marginTop={4}
+            marginLeft={4}
+            marginRight={4}
+          />
           ///: END:ONLY_INCLUDE_IF
         }
         {showSecurityProviderBanner && (
@@ -204,7 +209,7 @@ export default function SignatureRequestSIWE({
           footerClassName="signature-request-siwe__page-container-footer"
           onCancel={onCancel}
           onSubmit={() => {
-            ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+            ///: BEGIN:ONLY_INCLUDE_IF(snaps)
             if (warnings?.length >= 1) {
               return isSIWEDomainValid
                 ? setIsShowingSigInsightWarnings(true)
@@ -246,7 +251,7 @@ export default function SignatureRequestSIWE({
                 cancelText={t('cancel')}
                 cancelButtonType="default"
                 onSubmit={() => {
-                  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+                  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
                   if (warnings?.length >= 1) {
                     return setIsShowingSigInsightWarnings(true);
                   }
@@ -280,7 +285,7 @@ export default function SignatureRequestSIWE({
         )}
       </div>
       {
-        ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+        ///: BEGIN:ONLY_INCLUDE_IF(snaps)
       }
       {isShowingSigInsightWarnings && (
         <InsightWarnings
@@ -306,7 +311,7 @@ SignatureRequestSIWE.propTypes = {
    * The display content of transaction data
    */
   txData: PropTypes.object.isRequired,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   /**
    * Signature insights array
    */
diff --git a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
index 1e4303e31217..5aabba67b7d2 100644
--- a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
@@ -130,6 +130,7 @@ exports[`Signature Request Component render should match snapshot when we are us
             </div>
             <div
               class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+              style="height: 16px; width: 16px;"
             >
               <span
                 class="icon-with-fallback__fallback"
@@ -901,6 +902,7 @@ exports[`Signature Request Component render should match snapshot when we want t
             </div>
             <div
               class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+              style="height: 16px; width: 16px;"
             >
               <span
                 class="icon-with-fallback__fallback"
diff --git a/ui/pages/confirmations/components/signature-request/signature-request-data/signature-request-data.test.js b/ui/pages/confirmations/components/signature-request/signature-request-data/signature-request-data.test.js
index c52138acf424..c5b642ab3a77 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request-data/signature-request-data.test.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request-data/signature-request-data.test.js
@@ -39,16 +39,6 @@ describe('Signature Request Data', () => {
           type: 'test',
           chainId: '0x5',
         },
-        identities: {
-          '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826': {
-            name: 'Account 1',
-            address: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
-          },
-          '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF': {
-            name: 'Account 2',
-            address: '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF',
-          },
-        },
         internalAccounts: {
           accounts: {
             'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
diff --git a/ui/pages/confirmations/components/signature-request/signature-request.js b/ui/pages/confirmations/components/signature-request/signature-request.js
index 80d978bc7b3a..73b0fa64fe5c 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request.js
@@ -13,15 +13,11 @@ import {
   resolvePendingApproval,
   completedTx,
   rejectPendingApproval,
-  dismissOpenSeaToBlockaidBanner,
 } from '../../../../store/actions';
 import {
   doesAddressRequireLedgerHidConnection,
   getSubjectMetadata,
   getTotalUnapprovedMessagesCount,
-  getHasDismissedOpenSeaToBlockaidBanner,
-  getIsNetworkSupportedByBlockaid,
-  getHasMigratedFromOpenSeaToBlockaid,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   accountsWithSendEtherInfoSelector,
   getSelectedAccount,
@@ -41,7 +37,6 @@ import {
 } from '../../../../helpers/utils/util';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useRejectTransactionModal } from '../../hooks/useRejectTransactionModal';
-
 import { ConfirmPageContainerNavigation } from '../confirm-page-container';
 import SignatureRequestHeader from '../signature-request-header/signature-request-header';
 import SecurityProviderBannerMessage from '../security-provider-banner-message';
@@ -53,13 +48,11 @@ import {
   BlockaidResultType,
   SECURITY_PROVIDER_MESSAGE_SEVERITY,
 } from '../../../../../shared/constants/security-provider';
-
 import {
   TextAlign,
   TextColor,
   TextVariant,
   Size,
-  Severity,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   IconColor,
   BackgroundColor,
@@ -73,7 +66,6 @@ import {
   ButtonLink,
   TagUrl,
   Text,
-  BannerAlert,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   Icon,
   IconName,
@@ -88,15 +80,16 @@ import { useMMICustodySignMessage } from '../../../../hooks/useMMICustodySignMes
 import BlockaidBannerAlert from '../security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
 ///: END:ONLY_INCLUDE_IF
 
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import InsightWarnings from '../../../../components/app/snaps/insight-warnings';
 ///: END:ONLY_INCLUDE_IF
+import { BlockaidUnavailableBannerAlert } from '../blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert';
 import Message from './signature-request-message';
 import Footer from './signature-request-footer';
 
 const SignatureRequest = ({
   txData,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   warnings,
   ///: END:ONLY_INCLUDE_IF
 }) => {
@@ -138,7 +131,7 @@ const SignatureRequest = ({
   const { custodySignFn } = useMMICustodySignMessage();
   ///: END:ONLY_INCLUDE_IF
 
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   const [isShowingSigInsightWarnings, setIsShowingSigInsightWarnings] =
     useState(false);
   ///: END:ONLY_INCLUDE_IF
@@ -214,25 +207,6 @@ const SignatureRequest = ({
     primaryType,
   } = parseMessage(data);
 
-  const hasMigratedFromOpenSeaToBlockaid = useSelector(
-    getHasMigratedFromOpenSeaToBlockaid,
-  );
-  const isNetworkSupportedByBlockaid = useSelector(
-    getIsNetworkSupportedByBlockaid,
-  );
-  const hasDismissedOpenSeaToBlockaidBanner = useSelector(
-    getHasDismissedOpenSeaToBlockaidBanner,
-  );
-
-  const showOpenSeaToBlockaidBannerAlert =
-    hasMigratedFromOpenSeaToBlockaid &&
-    !isNetworkSupportedByBlockaid &&
-    !hasDismissedOpenSeaToBlockaidBanner;
-
-  const handleCloseOpenSeaToBlockaidBannerAlert = () => {
-    dispatch(dismissOpenSeaToBlockaidBanner());
-  };
-
   return (
     <>
       <div className="signature-request">
@@ -254,23 +228,7 @@ const SignatureRequest = ({
             />
             ///: END:ONLY_INCLUDE_IF
           }
-          {showOpenSeaToBlockaidBannerAlert ? (
-            <BannerAlert
-              severity={Severity.Info}
-              title={t('openSeaToBlockaidTitle')}
-              description={t('openSeaToBlockaidDescription')}
-              actionButtonLabel={t('openSeaToBlockaidBtnLabel')}
-              actionButtonProps={{
-                href: 'https://snaps.metamask.io/transaction-insights',
-                externalLink: true,
-              }}
-              marginBottom={4}
-              marginLeft={4}
-              marginTop={4}
-              marginRight={4}
-              onClose={handleCloseOpenSeaToBlockaidBannerAlert}
-            />
-          ) : null}
+          <BlockaidUnavailableBannerAlert />
           {(txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
             txData?.securityProviderResponse?.flagAsDangerous !==
               SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS) ||
@@ -373,7 +331,7 @@ const SignatureRequest = ({
         <Footer
           cancelAction={onCancel}
           signAction={() => {
-            ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+            ///: BEGIN:ONLY_INCLUDE_IF(snaps)
             if (warnings?.length >= 1) {
               return setIsShowingSigInsightWarnings(true);
             }
@@ -410,7 +368,7 @@ const SignatureRequest = ({
         ) : null}
       </div>
       {
-        ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+        ///: BEGIN:ONLY_INCLUDE_IF(snaps)
       }
       {isShowingSigInsightWarnings && (
         <InsightWarnings
@@ -433,7 +391,7 @@ const SignatureRequest = ({
 
 SignatureRequest.propTypes = {
   txData: PropTypes.object,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   warnings: PropTypes.array,
   ///: END:ONLY_INCLUDE_IF
 };
diff --git a/ui/pages/confirmations/components/signature-request/signature-request.stories.js b/ui/pages/confirmations/components/signature-request/signature-request.stories.js
index 12aaea0f4dd6..b31032f8b1a7 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request.stories.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request.stories.js
@@ -9,7 +9,6 @@ const store = configureStore({
   ...testData,
   metamask: {
     ...testData.metamask,
-    selectedAddress: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
   },
 });
 
diff --git a/ui/pages/confirmations/components/signature-request/signature-request.test.js b/ui/pages/confirmations/components/signature-request/signature-request.test.js
index 92d37748b59a..1756ffa36219 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request.test.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request.test.js
@@ -22,6 +22,7 @@ import {
   unconfirmedTransactionsHashSelector,
   getAccountType,
   getMemoizedMetaMaskInternalAccounts,
+  getSelectedInternalAccount,
 } from '../../../../selectors';
 import SignatureRequest from './signature-request';
 
@@ -52,7 +53,6 @@ const mockStore = {
         name: 'John Doe',
       },
     },
-    selectedAddress: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
     internalAccounts: {
       accounts: {
         'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -65,7 +65,14 @@ const mockStore = {
             },
           },
           options: {},
-          methods: [...Object.values(EthMethod)],
+          methods: [
+            EthMethod.PersonalSign,
+            EthMethod.Sign,
+            EthMethod.SignTransaction,
+            EthMethod.SignTypedDataV1,
+            EthMethod.SignTypedDataV3,
+            EthMethod.SignTypedDataV4,
+          ],
           type: EthAccountType.Eoa,
         },
       },
@@ -102,6 +109,8 @@ jest.mock('../../../../hooks/useMMICustodySignMessage', () => ({
 jest.mock('@metamask-institutional/extension');
 
 const generateUseSelectorRouter = (opts) => (selector) => {
+  const mockSelectedInternalAccount = getSelectedInternalAccount(opts);
+
   switch (selector) {
     case getProviderConfig:
       return opts.metamask.providerConfig;
@@ -117,7 +126,7 @@ const generateUseSelectorRouter = (opts) => (selector) => {
       return opts.metamask.currencyRates[opts.metamask.providerConfig.ticker]
         ?.conversionRate;
     case getSelectedAccount:
-      return opts.metamask.accounts[opts.metamask.selectedAddress];
+      return mockSelectedInternalAccount;
     case getInternalAccounts:
       return Object.values(opts.metamask.internalAccounts.accounts);
     case getMemoizedMetaMaskInternalAccounts:
@@ -473,7 +482,6 @@ describe('Signature Request Component', () => {
           ...mockStore,
           metamask: {
             ...mockStore.metamask,
-            selectedAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
             accounts: {
               ...mockStore.metamask.accounts,
               '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
diff --git a/ui/pages/confirmations/components/simulation-details/amount-pill.test.tsx b/ui/pages/confirmations/components/simulation-details/amount-pill.test.tsx
index d3a458400326..c35b090fda84 100644
--- a/ui/pages/confirmations/components/simulation-details/amount-pill.test.tsx
+++ b/ui/pages/confirmations/components/simulation-details/amount-pill.test.tsx
@@ -1,16 +1,23 @@
 import React from 'react';
 import { render } from '@testing-library/react';
+import { BigNumber } from 'bignumber.js';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
-import { Numeric } from '../../../../../shared/modules/Numeric';
 import Tooltip from '../../../../components/ui/tooltip';
 import { AmountPill } from './amount-pill';
 import {
-  Amount,
   AssetIdentifier,
   NATIVE_ASSET_IDENTIFIER,
   TokenAssetIdentifier,
 } from './types';
 
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn((selector) => selector()),
+}));
+
+jest.mock('../../../../ducks/locale/locale', () => ({
+  getIntlLocale: jest.fn(() => 'en-US'),
+}));
+
 jest.mock('../../../../components/ui/tooltip', () => ({
   __esModule: true,
   default: jest.fn(({ children }) => children),
@@ -35,7 +42,7 @@ const ERC1155_ASSET_MOCK: TokenAssetIdentifier = {
 
 const renderAndExpect = (
   asset: AssetIdentifier,
-  amount: Amount,
+  amount: BigNumber,
   expected: { text: string; tooltip: string },
 ): void => {
   const { getByText } = render(<AmountPill asset={asset} amount={amount} />);
@@ -47,50 +54,48 @@ const renderAndExpect = (
 };
 
 describe('AmountPill', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   const nativeAndErc20Cases = [
     {
-      isNegative: true,
-      numeric: new Numeric(-123.1234567, 10),
+      amount: new BigNumber(-123.1234567),
       expected: {
-        text: '- 123.123457',
+        text: '- 123.1',
         tooltip: '123.1234567',
       },
     },
     {
-      isNegative: false,
-      numeric: new Numeric(789.012, 10),
+      amount: new BigNumber(789.412),
       expected: {
-        text: '+ 789.012',
-        tooltip: '789.012',
+        text: '+ 789.4',
+        tooltip: '789.412',
       },
     },
     {
-      isNegative: true,
-      numeric: new Numeric(-0.000000001, 10),
+      amount: new BigNumber(-0.000000001),
       expected: {
         text: '- <0.000001',
         tooltip: '0.000000001',
       },
     },
     {
-      isNegative: false,
-      numeric: new Numeric(0.000000001, 10),
+      amount: new BigNumber(0.000000001),
       expected: {
         text: '+ <0.000001',
         tooltip: '0.000000001',
       },
     },
     {
-      isNegative: true,
-      numeric: new Numeric(0, 10),
+      amount: new BigNumber(-0),
       expected: {
         text: '- 0',
         tooltip: '0',
       },
     },
     {
-      isNegative: false,
-      numeric: new Numeric(0, 10),
+      amount: new BigNumber(0),
       expected: {
         text: '+ 0',
         tooltip: '0',
@@ -100,26 +105,18 @@ describe('AmountPill', () => {
 
   describe('Native', () => {
     it.each(nativeAndErc20Cases)(
-      'renders the correct sign and amount for $numeric.value',
-      ({ isNegative, numeric, expected }) => {
-        renderAndExpect(
-          NATIVE_ASSET_IDENTIFIER,
-          { isNegative, numeric } as Amount,
-          expected,
-        );
+      'renders the correct sign and amount for $amount',
+      ({ amount, expected }) => {
+        renderAndExpect(NATIVE_ASSET_IDENTIFIER, amount, expected);
       },
     );
   });
 
   describe('ERC20', () => {
     it.each(nativeAndErc20Cases)(
-      'renders the correct sign and amount for $numeric.value',
-      ({ isNegative, numeric, expected }) => {
-        renderAndExpect(
-          ERC20_ASSET_MOCK,
-          { isNegative, numeric } as Amount,
-          expected,
-        );
+      'renders the correct sign and amount for $amount',
+      ({ amount, expected }) => {
+        renderAndExpect(ERC20_ASSET_MOCK, amount, expected);
       },
     );
   });
@@ -127,16 +124,14 @@ describe('AmountPill', () => {
   describe('ERC721', () => {
     const cases = [
       {
-        isNegative: true,
-        numeric: new Numeric(-1, 10),
+        amount: new BigNumber(-1),
         expected: {
           text: '- #2748',
           tooltip: '#2748',
         },
       },
       {
-        isNegative: false,
-        numeric: new Numeric(1, 10),
+        amount: new BigNumber(1),
         expected: {
           text: '+ #2748',
           tooltip: '#2748',
@@ -146,12 +141,8 @@ describe('AmountPill', () => {
 
     it.each(cases)(
       'renders the token ID with just a plus or minus for $expected.text',
-      ({ isNegative, numeric, expected }) => {
-        renderAndExpect(
-          ERC721_ASSET_MOCK,
-          { isNegative, numeric } as Amount,
-          expected,
-        );
+      ({ amount, expected }) => {
+        renderAndExpect(ERC721_ASSET_MOCK, amount, expected);
       },
     );
   });
@@ -159,24 +150,21 @@ describe('AmountPill', () => {
   describe('ERC1155', () => {
     const cases = [
       {
-        isNegative: true,
-        numeric: new Numeric(-3, 10),
+        amount: new BigNumber(-3),
         expected: {
           text: '- 3 #2748',
           tooltip: '3 #2748',
         },
       },
       {
-        isNegative: false,
-        numeric: new Numeric(8, 10),
+        amount: new BigNumber(8),
         expected: {
           text: '+ 8 #2748',
           tooltip: '8 #2748',
         },
       },
       {
-        isNegative: true,
-        numeric: new Numeric(-12, 10),
+        amount: new BigNumber(-12),
         expected: {
           text: '- 12 #2748',
           tooltip: '12 #2748',
@@ -186,12 +174,8 @@ describe('AmountPill', () => {
 
     it.each(cases)(
       'renders the correct sign, amount, and token ID for $expected.text',
-      ({ isNegative, numeric, expected }) => {
-        renderAndExpect(
-          ERC1155_ASSET_MOCK,
-          { isNegative, numeric } as Amount,
-          expected,
-        );
+      ({ amount, expected }) => {
+        renderAndExpect(ERC1155_ASSET_MOCK, amount, expected);
       },
     );
   });
diff --git a/ui/pages/confirmations/components/simulation-details/amount-pill.tsx b/ui/pages/confirmations/components/simulation-details/amount-pill.tsx
index a57d8cf8700d..1204eaf16bd4 100644
--- a/ui/pages/confirmations/components/simulation-details/amount-pill.tsx
+++ b/ui/pages/confirmations/components/simulation-details/amount-pill.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import { BigNumber } from 'bignumber.js';
+import { useSelector } from 'react-redux';
 import { Box, Text } from '../../../../components/component-library';
 import {
   AlignItems,
@@ -11,21 +13,10 @@ import {
 } from '../../../../helpers/constants/design-system';
 import { hexToDecimal } from '../../../../../shared/modules/conversion.utils';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
-import {
-  DEFAULT_PRECISION_DECIMALS,
-  MIN_DISPLAY_AMOUNT,
-} from '../../../../hooks/useCurrencyDisplay';
 import Tooltip from '../../../../components/ui/tooltip';
-import { Amount, AssetIdentifier } from './types';
-
-// Format an amount for display.
-const formatAmount = (amount: Amount): string => {
-  const displayAmount = amount.numeric.abs().round(DEFAULT_PRECISION_DECIMALS);
-
-  return displayAmount.isZero() && !amount.numeric.isZero()
-    ? MIN_DISPLAY_AMOUNT
-    : displayAmount.toString();
-};
+import { getIntlLocale } from '../../../../ducks/locale/locale';
+import { AssetIdentifier } from './types';
+import { formatAmount, formatAmountMaxPrecision } from './formatAmount';
 
 /**
  * Displays a pill with an amount and a background color indicating whether the amount
@@ -37,23 +28,25 @@ const formatAmount = (amount: Amount): string => {
  */
 export const AmountPill: React.FC<{
   asset: AssetIdentifier;
-  amount: Amount;
+  amount: BigNumber;
 }> = ({ asset, amount }) => {
-  const backgroundColor = amount.isNegative
+  const locale = useSelector(getIntlLocale);
+
+  const backgroundColor = amount.isNegative()
     ? BackgroundColor.errorMuted
     : BackgroundColor.successMuted;
 
-  const color = amount.isNegative
+  const color = amount.isNegative()
     ? TextColor.errorAlternative
     : TextColor.successDefault;
 
-  const amountParts: string[] = [amount.isNegative ? '-' : '+'];
+  const amountParts: string[] = [amount.isNegative() ? '-' : '+'];
   const tooltipParts: string[] = [];
 
-  // ERC721 amounts are always 1 are not displayed.
+  // ERC721 amounts are always 1 and are not displayed.
   if (asset.standard !== TokenStandard.ERC721) {
-    const formattedAmount = formatAmount(amount);
-    const fullPrecisionAmount = amount.numeric.abs().toString();
+    const formattedAmount = formatAmount(locale, amount.abs());
+    const fullPrecisionAmount = formatAmountMaxPrecision(locale, amount.abs());
 
     amountParts.push(formattedAmount);
     tooltipParts.push(fullPrecisionAmount);
diff --git a/ui/pages/confirmations/components/simulation-details/asset-pill.test.tsx b/ui/pages/confirmations/components/simulation-details/asset-pill.test.tsx
index 3bc179edd759..334c79f372c9 100644
--- a/ui/pages/confirmations/components/simulation-details/asset-pill.test.tsx
+++ b/ui/pages/confirmations/components/simulation-details/asset-pill.test.tsx
@@ -21,7 +21,7 @@ jest.mock('../../../../components/app/name', () => ({
 }));
 
 describe('AssetPill', () => {
-  afterEach(() => {
+  beforeEach(() => {
     jest.clearAllMocks();
   });
 
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
new file mode 100644
index 000000000000..8a226ddca4f7
--- /dev/null
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
@@ -0,0 +1,44 @@
+import { BigNumber } from 'bignumber.js';
+import { formatAmount } from './formatAmount';
+
+describe('formatAmount', () => {
+  const locale = 'en-US';
+
+  it('returns "0" for zero amount', () => {
+    expect(formatAmount(locale, new BigNumber(0))).toBe('0');
+  });
+
+  it('returns "<0.000001" for 0 < amount < MIN_AMOUNT', () => {
+    expect(formatAmount(locale, new BigNumber(0.0000009))).toBe('<0.000001');
+  });
+
+  it.each([
+    [0.0000456, '0.000046'],
+    [0.0004567, '0.000457'],
+    [0.003456, '0.00346'],
+    [0.023456, '0.0235'],
+    [0.125456, '0.125'],
+  ])(
+    'formats amount less than 1 with maximum significant digits (%s => %s)',
+    (amount, expected) => {
+      expect(formatAmount(locale, new BigNumber(amount))).toBe(expected);
+    },
+  );
+
+  it.each([
+    [1.0034, '1.003'],
+    [1.034, '1.034'],
+    [1.3034, '1.303'],
+    [12.0345, '12.03'],
+    [121.456, '121.5'],
+    [1034.123, '1,034'],
+    [47361034.006, '47,361,034'],
+    ['12130982923409.5', '12,130,982,923,410'],
+    ['1213098292340944.5', '1,213,098,292,340,945'],
+  ])(
+    'formats amount greater than or equal to 1 with appropriate decimal precision (%s => %s)',
+    (amount, expected) => {
+      expect(formatAmount(locale, new BigNumber(amount))).toBe(expected);
+    },
+  );
+});
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
new file mode 100644
index 000000000000..1314b3b5f911
--- /dev/null
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
@@ -0,0 +1,86 @@
+import { BigNumber } from 'bignumber.js';
+import {
+  MIN_AMOUNT,
+  DEFAULT_PRECISION,
+} from '../../../../hooks/useCurrencyDisplay';
+
+// The number of significant decimals places to show for amounts less than 1.
+const MAX_SIGNIFICANT_DECIMAL_PLACES = 3;
+
+const ZERO_DISPLAY = '0';
+
+export function formatAmountMaxPrecision(
+  locale: string,
+  num: number | BigNumber,
+): string {
+  return new Intl.NumberFormat(locale, {
+    minimumSignificantDigits: 1,
+  }).format(new BigNumber(num.toString()).toNumber());
+}
+
+/**
+ * Formats the a token amount with variable precision and significant
+ * digits.
+ *
+ * If |amount| < 1, we display a maximum number of significant
+ * digits.
+ *
+ * If |amount| >= 1, we display all digits left of the decimal point.
+ * We also display some decimal places for smaller amounts, and
+ * gradually reduce the decimal precision as the amount
+ * gets bigger until we only show whole numbers.
+ *
+ * Examples:
+ *
+ * | Amount               | Formatted          |
+ * |----------------------|--------------------|
+ * | 0                    | 0                  |
+ * | 0.0000009            | <0.000001          |
+ * | 0.0000456            | 0.000046           |
+ * | 0.0004567            | 0.000457           |
+ * | 0.003456             | 0.00346            |
+ * | 0.023456             | 0.0235             |
+ * | 0.125456             | 0.125              |
+ * | 1.0034               | 1.003              |
+ * | 1.034                | 1.034              |
+ * | 1.3034               | 1.303              |
+ * | 12.0345              | 12.03              |
+ * | 121.456              | 121.5              |
+ * | 1,034.123            | 1,034              |
+ * | 47,361,034.006       | 47,361,034         |
+ * | 12,130,982,923,409.5 | 12,130,982,923,410 |
+ *
+ * @param locale
+ * @param amount
+ */
+export function formatAmount(locale: string, amount: BigNumber): string {
+  if (amount.isZero()) {
+    return ZERO_DISPLAY;
+  }
+
+  if (amount.abs().lessThan(MIN_AMOUNT)) {
+    return `<${formatAmountMaxPrecision(locale, MIN_AMOUNT)}`;
+  }
+
+  if (amount.abs().lessThan(1)) {
+    return new Intl.NumberFormat(locale, {
+      maximumSignificantDigits: MAX_SIGNIFICANT_DECIMAL_PLACES,
+    } as Intl.NumberFormatOptions).format(
+      amount.round(DEFAULT_PRECISION).toNumber(),
+    );
+  }
+
+  // Preserve all digits left of the decimal point.
+  // Cap the digits right of the decimal point: The more digits present
+  // on the left side of the decimal point, the less decimal places
+  // we show on the right side.
+  const digitsLeftOfDecimal = amount.abs().truncated().toString().length;
+  const maximumFractionDigits = Math.max(
+    0,
+    MAX_SIGNIFICANT_DECIMAL_PLACES - digitsLeftOfDecimal + 1,
+  );
+
+  return new Intl.NumberFormat(locale, {
+    maximumFractionDigits,
+  } as Intl.NumberFormatOptions).format(amount.toNumber());
+}
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
index d72f6ff7fd28..5971e513e3a1 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
@@ -5,6 +5,7 @@ import {
   SimulationData,
   SimulationErrorCode,
 } from '@metamask/transaction-controller';
+import { BigNumber } from 'bignumber.js';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import mockState from '../../../../../test/data/mock-state.json';
 import { SimulationDetails } from './simulation-details';
@@ -35,6 +36,7 @@ const renderSimulationDetails = (simulationData?: Partial<SimulationData>) =>
 
 describe('SimulationDetails', () => {
   beforeEach(() => {
+    jest.clearAllMocks();
     (useBalanceChanges as jest.Mock).mockReturnValue({
       pending: false,
       value: [],
@@ -97,8 +99,8 @@ describe('SimulationDetails', () => {
 
   it('passes the correct properties to BalanceChangeList components', () => {
     const balanceChangesMock = [
-      { amount: { isNegative: true } },
-      { amount: { isNegative: false } },
+      { amount: new BigNumber(-123) },
+      { amount: new BigNumber(456) },
     ] as BalanceChange[];
 
     (useBalanceChanges as jest.Mock).mockReturnValue({
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
index 664e76e4df69..038de4e8b63c 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import {
   SimulationData,
   SimulationError,
@@ -30,6 +30,8 @@ import { useSimulationMetrics } from './useSimulationMetrics';
 export type SimulationDetailsProps = {
   simulationData?: SimulationData;
   transactionId: string;
+  enableMetrics?: boolean;
+  isTransactionsRedesign?: boolean;
 };
 
 /**
@@ -125,19 +127,26 @@ const HeaderLayout: React.FC = ({ children }) => {
  *
  * @param props
  * @param props.inHeader
+ * @param props.isTransactionsRedesign
  * @param props.children
  */
 const SimulationDetailsLayout: React.FC<{
   inHeader?: React.ReactNode;
-}> = ({ inHeader, children }) => (
+  isTransactionsRedesign: boolean;
+}> = ({ inHeader, isTransactionsRedesign, children }) => (
   <Box
     data-testid="simulation-details-layout"
+    className="simulation-details-layout"
     display={Display.Flex}
     flexDirection={FlexDirection.Column}
     borderRadius={BorderRadius.MD}
-    borderColor={BorderColor.borderDefault}
+    borderColor={
+      isTransactionsRedesign
+        ? BorderColor.transparent
+        : BorderColor.borderDefault
+    }
     padding={3}
-    margin={4}
+    margin={isTransactionsRedesign ? null : 4}
     gap={3}
   >
     <HeaderLayout>{inHeader}</HeaderLayout>
@@ -145,60 +154,31 @@ const SimulationDetailsLayout: React.FC<{
   </Box>
 );
 
-function useLoadingTime() {
-  const [loadingStart] = useState(Date.now());
-  const [loadingTime, setLoadingTime] = useState<number | undefined>();
-
-  const setLoadingComplete = () => {
-    if (loadingTime === undefined) {
-      setLoadingTime((Date.now() - loadingStart) / 1000);
-    }
-  };
-
-  return { loadingTime, setLoadingComplete };
-}
-
-function normalizeSimulationData(simulationData?: SimulationData) {
-  const isInsufficientGasError = simulationData?.error?.message?.includes(
-    'insufficient funds for gas',
-  );
-
-  if (!isInsufficientGasError) {
-    return simulationData;
-  }
-
-  return {
-    ...simulationData,
-    error: {
-      code: SimulationErrorCode.Reverted,
-      message: 'Transaction was reverted',
-    },
-  };
-}
-
 /**
  * Preview of a transaction's effects using simulation data.
  *
  * @param props
  * @param props.simulationData - The simulation data to display.
  * @param props.transactionId - The ID of the transaction being simulated.
+ * @param props.enableMetrics - Whether to enable simulation metrics.
+ * @param props.isTransactionsRedesign - Whether or not the component is being
+ * used inside the transaction redesign flow.
  */
 export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
   simulationData,
   transactionId,
+  enableMetrics = false,
+  isTransactionsRedesign = false,
 }: SimulationDetailsProps) => {
-  // Temporary pending update to controller.
-  const normalizedSimulationData = normalizeSimulationData(simulationData);
-
   const t = useI18nContext();
-  const { loadingTime, setLoadingComplete } = useLoadingTime();
-  const balanceChangesResult = useBalanceChanges(normalizedSimulationData);
-  const loading = !normalizedSimulationData || balanceChangesResult.pending;
+  const balanceChangesResult = useBalanceChanges(simulationData);
+  const loading = !simulationData || balanceChangesResult.pending;
 
   useSimulationMetrics({
+    enableMetrics,
     balanceChanges: balanceChangesResult.value,
-    loadingTime,
-    simulationData: normalizedSimulationData as SimulationData,
+    loading,
+    simulationData,
     transactionId,
   });
 
@@ -206,13 +186,12 @@ export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
     return (
       <SimulationDetailsLayout
         inHeader={<LoadingIndicator />}
+        isTransactionsRedesign={isTransactionsRedesign}
       ></SimulationDetailsLayout>
     );
   }
 
-  setLoadingComplete();
-
-  const { error } = normalizedSimulationData;
+  const { error } = simulationData;
 
   if (
     [
@@ -225,7 +204,7 @@ export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
 
   if (error) {
     return (
-      <SimulationDetailsLayout>
+      <SimulationDetailsLayout isTransactionsRedesign={isTransactionsRedesign}>
         <ErrorContent error={error} />
       </SimulationDetailsLayout>
     );
@@ -235,16 +214,16 @@ export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
   const empty = balanceChanges.length === 0;
   if (empty) {
     return (
-      <SimulationDetailsLayout>
+      <SimulationDetailsLayout isTransactionsRedesign={isTransactionsRedesign}>
         <EmptyContent />
       </SimulationDetailsLayout>
     );
   }
 
-  const outgoing = balanceChanges.filter((change) => change.amount.isNegative);
-  const incoming = balanceChanges.filter((change) => !change.amount.isNegative);
+  const outgoing = balanceChanges.filter((bc) => bc.amount.isNegative());
+  const incoming = balanceChanges.filter((bc) => !bc.amount.isNegative());
   return (
-    <SimulationDetailsLayout>
+    <SimulationDetailsLayout isTransactionsRedesign={isTransactionsRedesign}>
       <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={3}>
         <BalanceChangeList
           heading={t('simulationDetailsOutgoingHeading')}
diff --git a/ui/pages/confirmations/components/simulation-details/types.ts b/ui/pages/confirmations/components/simulation-details/types.ts
index 913873692b76..7db6a30357cd 100644
--- a/ui/pages/confirmations/components/simulation-details/types.ts
+++ b/ui/pages/confirmations/components/simulation-details/types.ts
@@ -1,6 +1,6 @@
 import { Hex } from '@metamask/utils';
+import { BigNumber } from 'bignumber.js';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
-import { Numeric } from '../../../../../shared/modules/Numeric';
 
 export const NATIVE_ASSET_IDENTIFIER: NativeAssetIdentifier = {
   standard: TokenStandard.none,
@@ -36,57 +36,28 @@ export type AssetIdentifier = Readonly<
 >;
 
 /**
- * Represents an amount of an asset, including its magnitude and sign.
+ * Describes a change in an asset's balance to a user's wallet.
  */
-export type Amount = Readonly<{
-  /**
-   * Indicates whether the amount is negative (e.g., a decrease in balance).
-   */
-  isNegative: boolean;
-
+export type BalanceChange = Readonly<{
   /**
-   * The quantity of the smallest denomination of the asset (base units),
-   * represented as a hexadecimal string.
-   * For example: In the case of ETH, this would be the number of wei.
+   * The asset identifier for the balance change.
    */
-  quantity: Hex;
+  asset: AssetIdentifier;
 
   /**
-   * The number of decimal places the associated asset supports.
+   * The quantity of asset tokens, expressed as a decimal value.
    *
-   * This value is the negation of the exponent used when converting
-   * the quantity to the decimal amount of a token.
+   * This property represents the amount of tokens, taking into account the
+   * number of decimals supported by the asset. The value can be positive
+   * (increase) or negative (decrease).
    *
-   * To calculate the token amount in decimal form, use the formula:
-   * `tokenAmount = hexToDecimal(quantity) / (10 ^ decimals)`
-   *
-   * Example: If the asset is ETH, the quantity is expressed in wei
-   * (the smallest unit of ETH) and decimals would be 18. The amount
-   * of ETH tokens would be: `ethAmount = quantity / (10 ^ 18)`
+   * Example: If an asset supports 18 decimals, an `amount` of 1.5 represents
+   * 1.5 tokens, or more precisely, 1.5 * 10^18 of the smallest divisible unit.
    */
-  decimals: number;
-
-  /**
-   * The numeric representation of the amount, taking into account the
-   * sign, quantity and decimals.
-   */
-  numeric: Numeric;
-}>;
+  amount: BigNumber;
 
-/**
- * Describes a change in an asset's balance to a user's wallet.
- */
-export type BalanceChange = {
-  /**
-   * The asset identifier for the balance change.
-   */
-  asset: AssetIdentifier;
-  /**
-   * The amount of the asset that changed.
-   */
-  amount: Amount;
   /**
    * The amount of fiat currency that corresponds to the asset amount.
    */
   fiatAmount: FiatAmount;
-};
+}>;
diff --git a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
index 0020768a04c4..9846ab78f1f9 100644
--- a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
@@ -4,10 +4,10 @@ import {
   SimulationData,
   SimulationTokenStandard,
 } from '@metamask/transaction-controller';
+import { BigNumber } from 'bignumber.js';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
 import { getConversionRate } from '../../../../ducks/metamask/metamask';
 import { getTokenStandardAndDetails } from '../../../../store/actions';
-import { Numeric } from '../../../../../shared/modules/Numeric';
 import { fetchTokenExchangeRates } from '../../../../helpers/utils/util';
 import { useBalanceChanges } from './useBalanceChanges';
 import { FIAT_UNAVAILABLE } from './types';
@@ -41,8 +41,10 @@ const ETH_TO_FIAT_RATE = 3;
 
 const ERC20_TOKEN_ADDRESS_1_MOCK: Hex = '0x0erc20_1';
 const ERC20_TOKEN_ADDRESS_2_MOCK: Hex = '0x0erc20_2';
+const ERC20_TOKEN_ADDRESS_3_MOCK: Hex = '0x0erc20_3';
 const ERC20_DECIMALS_1_MOCK = 3;
 const ERC20_DECIMALS_2_MOCK = 4;
+const ERC20_DECIMALS_INVALID_MOCK = 'xyz';
 const ERC20_TO_FIAT_RATE_1_MOCK = 1.5;
 const ERC20_TO_FIAT_RATE_2_MOCK = 6;
 
@@ -68,9 +70,10 @@ describe('useBalanceChanges', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockGetTokenStandardAndDetails.mockImplementation((address: Hex) => {
-      const decimalMap: Record<Hex, number> = {
+      const decimalMap: Record<Hex, number | string> = {
         [ERC20_TOKEN_ADDRESS_1_MOCK]: ERC20_DECIMALS_1_MOCK,
         [ERC20_TOKEN_ADDRESS_2_MOCK]: ERC20_DECIMALS_2_MOCK,
+        [ERC20_TOKEN_ADDRESS_3_MOCK]: ERC20_DECIMALS_INVALID_MOCK,
       };
       if (decimalMap[address]) {
         return Promise.resolve({
@@ -159,7 +162,7 @@ describe('useBalanceChanges', () => {
       const { result, waitForNextUpdate } = setupHook([
         {
           ...dummyBalanceChange,
-          difference: DIFFERENCE_1_MOCK,
+          difference: '0x11',
           isDecrease: true,
           address: ERC20_TOKEN_ADDRESS_1_MOCK,
           standard: SimulationTokenStandard.erc20,
@@ -176,16 +179,11 @@ describe('useBalanceChanges', () => {
             standard: TokenStandard.ERC20,
             tokenId: undefined,
           },
-          amount: {
-            isNegative: true,
-            quantity: DIFFERENCE_1_MOCK,
-            decimals: 3,
-            numeric: expect.any(Numeric),
-          },
-          fiatAmount: Number('-0.0255'),
+          amount: new BigNumber('-0.017'),
+          fiatAmount: -0.0255,
         },
       ]);
-      expect(changes[0].amount.numeric.toString()).toBe('-0.017');
+      expect(changes[0].amount.toString()).toBe('-0.017');
     });
 
     it('handles multiple token balance changes', async () => {
@@ -210,9 +208,9 @@ describe('useBalanceChanges', () => {
 
       const changes = result.current.value;
       expect(changes).toHaveLength(2);
-      expect(changes[0].amount.numeric.toString()).toBe('-0.017');
+      expect(changes[0].amount.toString()).toBe('-0.017');
       expect(changes[0].fiatAmount).toBe(Number('-0.0255'));
-      expect(changes[1].amount.numeric.toString()).toBe('0.0002');
+      expect(changes[1].amount.toString()).toBe('0.0002');
       expect(changes[1].fiatAmount).toBe(Number('0.0012'));
     });
 
@@ -220,7 +218,7 @@ describe('useBalanceChanges', () => {
       const { result, waitForNextUpdate } = setupHook([
         {
           ...dummyBalanceChange,
-          difference: DIFFERENCE_1_MOCK,
+          difference: '0x1',
           isDecrease: true,
           address: NFT_TOKEN_ADDRESS_MOCK,
           standard: SimulationTokenStandard.erc721,
@@ -237,12 +235,7 @@ describe('useBalanceChanges', () => {
             standard: TokenStandard.ERC721,
             tokenId: TOKEN_ID_1_MOCK,
           },
-          amount: {
-            isNegative: true,
-            quantity: DIFFERENCE_1_MOCK,
-            decimals: 0,
-            numeric: expect.any(Numeric),
-          },
+          amount: new BigNumber('-1'),
           fiatAmount: FIAT_UNAVAILABLE,
         },
       ]);
@@ -261,7 +254,42 @@ describe('useBalanceChanges', () => {
 
       await waitForNextUpdate();
 
-      expect(result.current.value[0].amount.decimals).toBe(18);
+      expect(result.current.value[0].amount.decimalPlaces()).toBe(18);
+    });
+
+    it('uses default decimals when token details are not valid numbers', async () => {
+      const { result, waitForNextUpdate } = setupHook([
+        {
+          ...dummyBalanceChange,
+          difference: DIFFERENCE_1_MOCK,
+          isDecrease: true,
+          address: ERC20_TOKEN_ADDRESS_3_MOCK,
+          standard: SimulationTokenStandard.erc20,
+        },
+      ]);
+
+      await waitForNextUpdate();
+
+      expect(result.current.value[0].amount.decimalPlaces()).toBe(18);
+    });
+
+    it('handles token fiat rate with more than 15 significant digits', async () => {
+      mockFetchTokenExchangeRates.mockResolvedValue({
+        [ERC20_TOKEN_ADDRESS_1_MOCK]: 0.1234567890123456,
+      });
+      const { result, waitForNextUpdate } = setupHook([
+        {
+          ...dummyBalanceChange,
+          difference: DIFFERENCE_1_MOCK,
+          isDecrease: true,
+          address: ERC20_TOKEN_ADDRESS_1_MOCK,
+          standard: SimulationTokenStandard.erc20,
+        },
+      ]);
+
+      await waitForNextUpdate();
+
+      expect(result.current.value[0].fiatAmount).toBe(-0.002098765413209875);
     });
   });
 
@@ -291,18 +319,23 @@ describe('useBalanceChanges', () => {
           asset: {
             standard: TokenStandard.none,
           },
-          amount: {
-            isNegative: true,
-            quantity: DIFFERENCE_ETH_MOCK,
-            decimals: 18,
-            numeric: expect.any(Numeric),
-          },
+          amount: new BigNumber('-5373.003641998677469065'),
           fiatAmount: Number('-16119.010925996032'),
         },
       ]);
-      expect(changes[0].amount.numeric.toString()).toBe(
-        '-5373.003641998677469065',
-      );
+    });
+
+    it('handles native fiat rate with more than 15 significant digits', async () => {
+      mockGetConversionRate.mockReturnValue(0.1234567890123456);
+      const { result, waitForNextUpdate } = setupHook({
+        ...dummyBalanceChange,
+        difference: DIFFERENCE_ETH_MOCK,
+        isDecrease: true,
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current.value[0].fiatAmount).toBe(-663.3337769927953);
     });
 
     it('handles no native balance change', async () => {
@@ -340,14 +373,14 @@ describe('useBalanceChanges', () => {
     expect(changes[0].asset).toEqual({
       standard: TokenStandard.none,
     });
-    expect(changes[0].amount.numeric.toString()).toBe(
-      '-5373.003641998677469065',
+    expect(changes[0].amount).toEqual(
+      new BigNumber('-5373.003641998677469065'),
     );
     expect(changes[0].fiatAmount).toBe(Number('-16119.010925996032'));
     expect(changes[1].asset).toEqual({
       address: ERC20_TOKEN_ADDRESS_1_MOCK,
       standard: TokenStandard.ERC20,
     });
-    expect(changes[1].amount.numeric.toString()).toBe('0.002');
+    expect(changes[1].amount).toEqual(new BigNumber('0.002'));
   });
 });
diff --git a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
index f8480778afcf..87da7f4435c3 100644
--- a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
+++ b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
@@ -6,16 +6,15 @@ import {
   SimulationTokenBalanceChange,
   SimulationTokenStandard,
 } from '@metamask/transaction-controller';
+import { BigNumber } from 'bignumber.js';
 import { ContractExchangeRates } from '@metamask/assets-controllers';
 import { useAsyncResultOrThrow } from '../../../../hooks/useAsyncResult';
 import { getTokenStandardAndDetails } from '../../../../store/actions';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
-import { Numeric } from '../../../../../shared/modules/Numeric';
 import { getConversionRate } from '../../../../ducks/metamask/metamask';
 import { getCurrentChainId, getCurrentCurrency } from '../../../../selectors';
 import { fetchTokenExchangeRates } from '../../../../helpers/utils/util';
 import {
-  Amount,
   BalanceChange,
   FIAT_UNAVAILABLE,
   NATIVE_ASSET_IDENTIFIER,
@@ -26,6 +25,11 @@ const NATIVE_DECIMALS = 18;
 
 const ERC20_DEFAULT_DECIMALS = 18;
 
+// See https://github.com/MikeMcl/bignumber.js/issues/11#issuecomment-23053776
+function convertNumberToStringWithPrecisionWarning(value: number): string {
+  return String(value);
+}
+
 // Converts a SimulationTokenStandard to a TokenStandard
 function convertStandard(standard: SimulationTokenStandard) {
   switch (standard) {
@@ -44,19 +48,29 @@ function convertStandard(standard: SimulationTokenStandard) {
 function getAssetAmount(
   { isDecrease: isNegative, difference: quantity }: SimulationBalanceChange,
   decimals: number,
-): Amount {
-  const numeric = Numeric.from(quantity, 16)
-    .times(isNegative ? -1 : 1, 10)
-    .toBase(10)
-    .shiftedBy(decimals);
-  return { isNegative, quantity, decimals, numeric };
+): BigNumber {
+  return (
+    new BigNumber(quantity, 16)
+      .times(isNegative ? -1 : 1)
+      // Shift the decimal point to the left by the number of decimals.
+      .shift(-decimals)
+  );
 }
 
 // Fetches the decimals for the given token address.
 async function fetchErc20Decimals(address: Hex): Promise<number> {
   try {
-    const { decimals } = await getTokenStandardAndDetails(address);
-    return decimals ? parseInt(decimals, 10) : ERC20_DEFAULT_DECIMALS;
+    const { decimals: decStr } = await getTokenStandardAndDetails(address);
+    if (!decStr) {
+      return ERC20_DEFAULT_DECIMALS;
+    }
+    for (const radix of [10, 16]) {
+      const parsedDec = parseInt(decStr, radix);
+      if (isFinite(parsedDec)) {
+        return parsedDec;
+      }
+    }
+    return ERC20_DEFAULT_DECIMALS;
   } catch {
     return ERC20_DEFAULT_DECIMALS;
   }
@@ -106,8 +120,8 @@ function getNativeBalanceChange(
   }
   const asset = NATIVE_ASSET_IDENTIFIER;
   const amount = getAssetAmount(nativeBalanceChange, NATIVE_DECIMALS);
-  const fiatAmount = amount.numeric
-    .applyConversionRate(nativeFiatRate)
+  const fiatAmount = amount
+    .times(convertNumberToStringWithPrecisionWarning(nativeFiatRate))
     .toNumber();
   return { asset, amount, fiatAmount };
 }
@@ -126,12 +140,16 @@ function getTokenBalanceChanges(
     };
 
     const decimals =
-      asset.standard === TokenStandard.ERC20 ? erc20Decimals[asset.address] : 0;
+      asset.standard === TokenStandard.ERC20 && erc20Decimals[asset.address]
+        ? erc20Decimals[asset.address]
+        : 0;
     const amount = getAssetAmount(tokenBc, decimals);
 
     const fiatRate = erc20FiatRates[tokenBc.address];
     const fiatAmount = fiatRate
-      ? amount.numeric.applyConversionRate(fiatRate).toNumber()
+      ? amount
+          .times(convertNumberToStringWithPrecisionWarning(fiatRate))
+          .toNumber()
       : FIAT_UNAVAILABLE;
 
     return { asset, amount, fiatAmount };
@@ -140,7 +158,7 @@ function getTokenBalanceChanges(
 
 // Compiles a list of balance changes from simulation data
 export const useBalanceChanges = (
-  simulationData?: Partial<SimulationData>,
+  simulationData: SimulationData | undefined,
 ): { pending: boolean; value: BalanceChange[] } => {
   const chainId = useSelector(getCurrentChainId);
   const fiatCurrency = useSelector(getCurrentCurrency);
diff --git a/ui/pages/confirmations/components/simulation-details/useLoadingTime.test.ts b/ui/pages/confirmations/components/simulation-details/useLoadingTime.test.ts
new file mode 100644
index 000000000000..c450313bb6b2
--- /dev/null
+++ b/ui/pages/confirmations/components/simulation-details/useLoadingTime.test.ts
@@ -0,0 +1,43 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { useLoadingTime } from './useLoadingTime';
+
+describe('useLoadingTime', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('should return the loading time when setLoadingComplete is called', () => {
+    const { result } = renderHook(() => useLoadingTime());
+
+    expect(result.current.loadingTime).toBeUndefined();
+
+    act(() => {
+      jest.advanceTimersByTime(2000);
+      result.current.setLoadingComplete();
+    });
+
+    expect(result.current.loadingTime).toBeCloseTo(2);
+  });
+
+  it('should not update the loading time if setLoadingComplete is called multiple times', () => {
+    const { result } = renderHook(() => useLoadingTime());
+
+    act(() => {
+      jest.advanceTimersByTime(1000);
+      result.current.setLoadingComplete();
+    });
+
+    expect(result.current.loadingTime).toBeCloseTo(1);
+
+    act(() => {
+      jest.advanceTimersByTime(1000);
+      result.current.setLoadingComplete();
+    });
+
+    expect(result.current.loadingTime).toBeCloseTo(1);
+  });
+});
diff --git a/ui/pages/confirmations/components/simulation-details/useLoadingTime.ts b/ui/pages/confirmations/components/simulation-details/useLoadingTime.ts
new file mode 100644
index 000000000000..af8deaaf27fe
--- /dev/null
+++ b/ui/pages/confirmations/components/simulation-details/useLoadingTime.ts
@@ -0,0 +1,13 @@
+import { useState } from 'react';
+
+export function useLoadingTime() {
+  const [loadingStart] = useState(Date.now());
+  const [loadingTime, setLoadingTime] = useState<number | undefined>();
+
+  const setLoadingComplete = () => {
+    if (loadingTime === undefined) {
+      setLoadingTime((Date.now() - loadingStart) / 1000);
+    }
+  };
+  return { loadingTime, setLoadingComplete };
+}
diff --git a/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.test.ts b/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.test.ts
index 6eb9dded8ce5..789a3846ab8c 100644
--- a/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.test.ts
@@ -3,6 +3,8 @@ import {
   SimulationData,
   SimulationErrorCode,
 } from '@metamask/transaction-controller';
+import { BigNumber } from 'bignumber.js';
+import { renderHook } from '@testing-library/react-hooks';
 import { useTransactionEventFragment } from '../../hooks/useTransactionEventFragment';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
 import {
@@ -18,8 +20,10 @@ import {
   AssetType,
   FiatType,
   PetnameType,
+  UseSimulationMetricsProps,
   useSimulationMetrics,
 } from './useSimulationMetrics';
+import { useLoadingTime } from './useLoadingTime';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -33,6 +37,7 @@ jest.mock('react', () => ({
   useState: jest.fn(),
 }));
 
+jest.mock('./useLoadingTime');
 jest.mock('../../../../hooks/useDisplayName');
 jest.mock('../../../../hooks/useName');
 jest.mock('../../../../pages/confirmations/hooks/useTransactionEventFragment');
@@ -44,7 +49,7 @@ const SYMBOL_MOCK = 'TST';
 
 const BALANCE_CHANGE_MOCK = {
   asset: { address: ADDRESS_MOCK, standard: TokenStandard.ERC20 },
-  amount: { isNegative: true, quantity: '0x1', decimals: 18 },
+  amount: new BigNumber(-1),
   fiatAmount: 1.23,
 } as unknown as BalanceChange;
 
@@ -71,7 +76,14 @@ describe('useSimulationMetrics', () => {
   const useEffectMock = jest.mocked(useEffect);
   const useDisplayNamesMock = jest.mocked(useDisplayNames);
   const useContextMock = jest.mocked(useContext);
+  const useLoadingTimeMock = jest.mocked(useLoadingTime);
+  const setLoadingCompleteMock = jest.fn();
+
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let updateTransactionEventFragmentMock: jest.MockedFunction<any>;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let trackEventMock: jest.MockedFunction<any>;
 
   function expectUpdateTransactionEventFragmentCalled(
@@ -82,12 +94,15 @@ describe('useSimulationMetrics', () => {
       balanceChanges?: BalanceChange[];
       simulationData?: SimulationData | undefined;
     },
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     expected: any,
   ) {
     useSimulationMetrics({
+      enableMetrics: true,
       balanceChanges: balanceChanges ?? [],
       simulationData,
-      loadingTime: LOADING_TIME_MOCK,
+      loading: false,
       transactionId: TRANSACTION_ID_MOCK,
     });
 
@@ -108,29 +123,48 @@ describe('useSimulationMetrics', () => {
       updateTransactionEventFragment: updateTransactionEventFragmentMock,
     });
 
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     useStateMock.mockImplementation(((initialValue: any) => [
       initialValue,
       jest.fn(),
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ]) as any);
 
     useEffectMock.mockImplementation((fn) => fn());
     useContextMock.mockReturnValue(trackEventMock);
     useDisplayNamesMock.mockReturnValue([DISPLAY_NAME_UNKNOWN_MOCK]);
+    useLoadingTimeMock.mockReturnValue({
+      loadingTime: LOADING_TIME_MOCK,
+      setLoadingComplete: setLoadingCompleteMock,
+    });
   });
 
   describe('updates transaction event fragment', () => {
-    it('with loading time', () => {
-      useDisplayNamesMock.mockReset();
-      useDisplayNamesMock.mockReturnValue([]);
+    it('with loading time', async () => {
+      const props = {
+        balanceChanges: [BALANCE_CHANGE_MOCK],
+        loading: false,
+        simulationData: { tokenBalanceChanges: [] } as SimulationData,
+        transactionId: 'test-transaction-id',
+        enableMetrics: true,
+      };
 
-      expectUpdateTransactionEventFragmentCalled(
-        { simulationData: undefined },
+      renderHook((p: UseSimulationMetricsProps) => useSimulationMetrics(p), {
+        initialProps: props,
+      });
+
+      expect(setLoadingCompleteMock).toHaveBeenCalledTimes(1);
+      expect(updateTransactionEventFragmentMock).toHaveBeenCalledWith(
         expect.objectContaining({
           properties: expect.objectContaining({
             simulation_latency: LOADING_TIME_MOCK,
           }),
         }),
+        'test-transaction-id',
       );
+      jest.restoreAllMocks();
     });
 
     it.each([
@@ -168,7 +202,7 @@ describe('useSimulationMetrics', () => {
     ])('with asset quantity if %s', (_, isNegative, property) => {
       const balanceChange = {
         ...BALANCE_CHANGE_MOCK,
-        amount: { ...BALANCE_CHANGE_MOCK.amount, isNegative },
+        amount: new BigNumber(isNegative ? -1 : 1),
       };
 
       expectUpdateTransactionEventFragmentCalled(
@@ -247,7 +281,7 @@ describe('useSimulationMetrics', () => {
             {
               ...BALANCE_CHANGE_MOCK,
               asset: { ...BALANCE_CHANGE_MOCK.asset, standard },
-              amount: { ...BALANCE_CHANGE_MOCK.amount, isNegative },
+              amount: new BigNumber(isNegative ? -1 : 1),
             } as BalanceChange,
           ],
         },
@@ -293,10 +327,7 @@ describe('useSimulationMetrics', () => {
       (_, fiatAmount, isNegative, property, expected) => {
         const balanceChange = {
           ...BALANCE_CHANGE_MOCK,
-          amount: {
-            ...BALANCE_CHANGE_MOCK.amount,
-            isNegative,
-          },
+          amount: new BigNumber(isNegative ? -1 : 1),
           fiatAmount,
         };
 
@@ -387,10 +418,7 @@ describe('useSimulationMetrics', () => {
 
         const balanceChange = {
           ...BALANCE_CHANGE_MOCK,
-          amount: {
-            ...BALANCE_CHANGE_MOCK.amount,
-            isNegative,
-          },
+          amount: new BigNumber(isNegative ? -1 : 1),
           asset: { ...BALANCE_CHANGE_MOCK.asset, standard },
         };
 
@@ -413,10 +441,7 @@ describe('useSimulationMetrics', () => {
     ])('with asset total value if %s', (_, isNegative, property) => {
       const balanceChange1 = {
         ...BALANCE_CHANGE_MOCK,
-        amount: {
-          ...BALANCE_CHANGE_MOCK.amount,
-          isNegative,
-        },
+        amount: new BigNumber(isNegative ? -1 : 1),
         fiatAmount: 1.23,
       };
 
@@ -441,9 +466,10 @@ describe('useSimulationMetrics', () => {
   describe('creates incomplete asset event', () => {
     it('if petname is unknown', () => {
       useSimulationMetrics({
+        enableMetrics: true,
         balanceChanges: [BALANCE_CHANGE_MOCK],
         simulationData: undefined,
-        loadingTime: LOADING_TIME_MOCK,
+        loading: false,
         transactionId: TRANSACTION_ID_MOCK,
       });
 
@@ -467,9 +493,10 @@ describe('useSimulationMetrics', () => {
       useDisplayNamesMock.mockReturnValue([DISPLAY_NAME_SAVED_MOCK]);
 
       useSimulationMetrics({
+        enableMetrics: true,
         balanceChanges: [{ ...BALANCE_CHANGE_MOCK, fiatAmount: null }],
         simulationData: undefined,
-        loadingTime: LOADING_TIME_MOCK,
+        loading: false,
         transactionId: TRANSACTION_ID_MOCK,
       });
 
@@ -490,16 +517,23 @@ describe('useSimulationMetrics', () => {
   });
 
   it.each([
-    ['simulation disabled', { error: { code: SimulationErrorCode.Disabled } }],
+    [
+      'simulation disabled',
+      true,
+      { error: { code: SimulationErrorCode.Disabled } },
+    ],
     [
       'chain not supported',
+      true,
       { error: { code: SimulationErrorCode.ChainNotSupported } },
     ],
-  ])('does not update fragment if %s', (_, simulationData) => {
+    ['metrics not enabled', false, undefined],
+  ])('does not update fragment if %s', (_, enableMetrics, simulationData) => {
     useSimulationMetrics({
+      enableMetrics,
       balanceChanges: [BALANCE_CHANGE_MOCK],
       simulationData: simulationData as SimulationData,
-      loadingTime: LOADING_TIME_MOCK,
+      loading: false,
       transactionId: TRANSACTION_ID_MOCK,
     });
 
diff --git a/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.ts b/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.ts
index efb27499b45d..178561d0f5d6 100644
--- a/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.ts
+++ b/ui/pages/confirmations/components/simulation-details/useSimulationMetrics.ts
@@ -18,12 +18,14 @@ import {
 } from '../../../../../shared/constants/metametrics';
 import { calculateTotalFiat } from './fiat-display';
 import { BalanceChange } from './types';
+import { useLoadingTime } from './useLoadingTime';
 
 export type UseSimulationMetricsProps = {
   balanceChanges: BalanceChange[];
-  loadingTime?: number;
+  loading: boolean;
   simulationData?: SimulationData;
   transactionId: string;
+  enableMetrics: boolean;
 };
 
 export enum SimulationResponseType {
@@ -54,10 +56,17 @@ export enum PetnameType {
 
 export function useSimulationMetrics({
   balanceChanges,
-  loadingTime,
+  loading,
   simulationData,
   transactionId,
+  enableMetrics,
 }: UseSimulationMetricsProps) {
+  const { loadingTime, setLoadingComplete } = useLoadingTime();
+
+  if (!loading) {
+    setLoadingComplete();
+  }
+
   const displayNameRequests: UseDisplayNameRequest[] = balanceChanges.map(
     ({ asset }) => ({
       value: asset.address ?? '',
@@ -81,11 +90,11 @@ export function useSimulationMetrics({
   useIncompleteAssetEvent(balanceChanges, displayNamesByAddress);
 
   const receivingAssets = balanceChanges.filter(
-    (change) => !change.amount.isNegative,
+    (change) => !change.amount.isNegative(),
   );
 
-  const sendingAssets = balanceChanges.filter(
-    (change) => change.amount.isNegative,
+  const sendingAssets = balanceChanges.filter((change) =>
+    change.amount.isNegative(),
   );
 
   const simulationResponse = getSimulationResponseType(simulationData);
@@ -113,10 +122,12 @@ export function useSimulationMetrics({
 
   const params = { properties, sensitiveProperties };
 
-  const shouldSkipMetrics = [
-    SimulationErrorCode.ChainNotSupported,
-    SimulationErrorCode.Disabled,
-  ].includes(simulationData?.error?.code as SimulationErrorCode);
+  const shouldSkipMetrics =
+    !enableMetrics ||
+    [
+      SimulationErrorCode.ChainNotSupported,
+      SimulationErrorCode.Disabled,
+    ].includes(simulationData?.error?.code as SimulationErrorCode);
 
   useEffect(() => {
     if (shouldSkipMetrics) {
@@ -206,6 +217,8 @@ function getSensitiveProperties(changes: BalanceChange[], prefix: string) {
   return getPrefixProperties({ total_value: totalValue }, prefix);
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getPrefixProperties(properties: Record<string, any>, prefix: string) {
   return Object.entries(properties).reduce(
     (acc, [key, value]) => ({
diff --git a/ui/pages/confirmations/components/simulation-error-message/simulation-error-message.js b/ui/pages/confirmations/components/simulation-error-message/simulation-error-message.js
index 3c0843248a50..a80bd4b6a159 100644
--- a/ui/pages/confirmations/components/simulation-error-message/simulation-error-message.js
+++ b/ui/pages/confirmations/components/simulation-error-message/simulation-error-message.js
@@ -1,7 +1,7 @@
 import React, { useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { BannerAlert } from '../../../../components/component-library';
-import { SEVERITIES } from '../../../../helpers/constants/design-system';
+import { Severity } from '../../../../helpers/constants/design-system';
 
 import { I18nContext } from '../../../../../.storybook/i18n';
 import {
@@ -32,12 +32,12 @@ export default function SimulationErrorMessage({
   }, []);
 
   return userAcknowledgedGasMissing === true ? (
-    <BannerAlert severity={SEVERITIES.DANGER}>
+    <BannerAlert severity={Severity.Danger}>
       {t('simulationErrorMessageV2')}
     </BannerAlert>
   ) : (
     <BannerAlert
-      severity={SEVERITIES.DANGER}
+      severity={Severity.Danger}
       actionButtonLabel={t('proceedWithTransaction')}
       actionButtonOnClick={setUserAcknowledgedGasMissing}
     >
diff --git a/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.test.tsx b/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.test.tsx
index 6a487f0bab83..ae1bc86aee30 100644
--- a/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.test.tsx
+++ b/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.test.tsx
@@ -5,11 +5,7 @@ import mockState from '../../../../../test/data/mock-send-state.json';
 import { renderWithProvider } from '../../../../../test/jest';
 import SnapAccountSuccessMessage from './SnapAccountSuccessMessage';
 
-const store = configureStore({
-  metamask: {
-    ...mockState.metamask,
-  },
-});
+const store = configureStore(mockState);
 
 // If you're using some kind of global variable (like `global.platform` in your component), you might want to mock it.
 global.platform = {
diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
index ece1f397831f..58bd513d362a 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
@@ -3,17 +3,21 @@ import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { TransactionType } from '@metamask/transaction-controller';
 import { PriorityLevels } from '../../../../../shared/constants/gas';
-import { submittedPendingTransactionsSelector } from '../../../../selectors';
 import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import {
   BannerAlert,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   ButtonLink,
   Text,
+  ///: END:ONLY_INCLUDE_IF
 } from '../../../../components/component-library';
 import SimulationErrorMessage from '../simulation-error-message';
 import { SEVERITIES } from '../../../../helpers/constants/design-system';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+import { submittedPendingTransactionsSelector } from '../../../../selectors';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
+///: END:ONLY_INCLUDE_IF
 
 import { isSuspiciousResponse } from '../../../../../shared/modules/security-provider.utils';
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
@@ -31,9 +35,18 @@ const TransactionAlerts = ({
   txData,
   isUsingPaymaster,
 }) => {
-  const { estimateUsed, hasSimulationError, supportsEIP1559, isNetworkBusy } =
-    useGasFeeContext();
+  const {
+    estimateUsed,
+    hasSimulationError,
+    ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+    supportsEIP1559,
+    ///: END:ONLY_INCLUDE_IF
+  } = useGasFeeContext();
+
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const pendingTransactions = useSelector(submittedPendingTransactionsSelector);
+  ///: END:ONLY_INCLUDE_IF
+
   const t = useI18nContext();
   const nativeCurrency = useSelector(getNativeCurrency);
   const transactionData = txData.txParams.data;
@@ -72,36 +85,42 @@ const TransactionAlerts = ({
         />
       )}
 
-      {supportsEIP1559 && hasSimulationError && (
+      {hasSimulationError && (
         <SimulationErrorMessage
           userAcknowledgedGasMissing={userAcknowledgedGasMissing}
           setUserAcknowledgedGasMissing={setUserAcknowledgedGasMissing}
         />
       )}
-      {supportsEIP1559 && pendingTransactions?.length > 0 && (
-        <BannerAlert severity={SEVERITIES.WARNING}>
-          <Text as="p">
-            <strong>
-              {pendingTransactions?.length === 1
-                ? t('pendingTransactionSingle', [pendingTransactions?.length])
-                : t('pendingTransactionMultiple', [
-                    pendingTransactions?.length,
-                  ])}
-            </strong>{' '}
-            {t('pendingTransactionInfo')}
-            {t('learnCancelSpeeedup', [
-              <ButtonLink
-                key="cancelSpeedUpInfo"
-                href={ZENDESK_URLS.SPEEDUP_CANCEL}
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                {t('cancelSpeedUp')}
-              </ButtonLink>,
-            ])}
-          </Text>
-        </BannerAlert>
-      )}
+
+      {
+        ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+        supportsEIP1559 && pendingTransactions?.length > 0 && (
+          <BannerAlert severity={SEVERITIES.WARNING}>
+            <Text as="p">
+              <strong>
+                {pendingTransactions?.length === 1
+                  ? t('pendingTransactionSingle', [pendingTransactions?.length])
+                  : t('pendingTransactionMultiple', [
+                      pendingTransactions?.length,
+                    ])}
+              </strong>{' '}
+              {t('pendingTransactionInfo')}
+              {t('learnCancelSpeeedup', [
+                <ButtonLink
+                  key="cancelSpeedUpInfo"
+                  href={ZENDESK_URLS.SPEEDUP_CANCEL}
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  {t('cancelSpeedUp')}
+                </ButtonLink>,
+              ])}
+            </Text>
+          </BannerAlert>
+        )
+        ///: END:ONLY_INCLUDE_IF
+      }
+
       {estimateUsed === PriorityLevels.low && (
         <BannerAlert
           data-testid="low-gas-fee-alert"
@@ -110,11 +129,6 @@ const TransactionAlerts = ({
           {t('lowPriorityMessage')}
         </BannerAlert>
       )}
-      {supportsEIP1559 && isNetworkBusy ? (
-        <BannerAlert severity={SEVERITIES.WARNING}>
-          {t('networkIsBusy')}
-        </BannerAlert>
-      ) : null}
       {isSendingZero && (
         <BannerAlert severity={SEVERITIES.WARNING}>
           {t('sendingZeroAmount', [currentTokenSymbol])}
diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js
index 77c9e43b4c5a..c74dc5f1b005 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js
@@ -7,8 +7,12 @@ import { NetworkStatus } from '@metamask/network-controller';
 import { GasFeeContextProvider } from '../../../../contexts/gasFee';
 import configureStore from '../../../../store/store';
 import testData from '../../../../../.storybook/test-data';
+import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
 import TransactionAlerts from '.';
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(testData);
+
 const customTransaction = ({
   estimateUsed,
   hasSimulationError,
@@ -28,7 +32,7 @@ const customTransaction = ({
       gas: '0x5208',
       gasPrice: '0x147d357000',
       nonce: '0xf',
-      to: testData?.metamask?.selectedAddress,
+      to: mockSelectedInternalAccount.address,
       value: '0x63eb89da4ed00000',
       ...props?.txParams,
     },
diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js
index 6bc517ace871..6ae1a59591dd 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js
@@ -197,9 +197,6 @@ describe('TransactionAlerts', () => {
     describe('if hasSimulationError from useGasFeeContext is falsy', () => {
       it('does not inform the user that a simulation of the transaction failed', () => {
         const { queryByText } = render({
-          useGasFeeContextValue: {
-            supportsEIP1559: true,
-          },
           componentProps: {
             txData: {
               txParams: {
@@ -336,57 +333,11 @@ describe('TransactionAlerts', () => {
         ).not.toBeInTheDocument();
       });
     });
-
-    describe('if isNetworkBusy from useGasFeeContext is truthy', () => {
-      it('informs the user that the network is busy', () => {
-        const { getByText } = render({
-          useGasFeeContextValue: {
-            supportsEIP1559: true,
-            isNetworkBusy: true,
-          },
-          componentProps: {
-            txData: {
-              txParams: {
-                value: '0x1',
-              },
-            },
-          },
-        });
-        expect(
-          getByText(
-            'Network is busy. Gas prices are high and estimates are less accurate.',
-          ),
-        ).toBeInTheDocument();
-      });
-    });
-
-    describe('if isNetworkBusy from useGasFeeContext is falsy', () => {
-      it('does not inform the user that the network is busy', () => {
-        const { queryByText } = render({
-          useGasFeeContextValue: {
-            supportsEIP1559: true,
-            isNetworkBusy: false,
-          },
-          componentProps: {
-            txData: {
-              txParams: {
-                value: '0x1',
-              },
-            },
-          },
-        });
-        expect(
-          queryByText(
-            'Network is busy. Gas prices are high and estimates are less accurate.',
-          ),
-        ).not.toBeInTheDocument();
-      });
-    });
   });
 
   describe('when supportsEIP1559 from useGasFeeContext is falsy', () => {
     describe('if hasSimulationError from useGasFeeContext is true', () => {
-      it('does not inform the user that a simulation of the transaction failed', () => {
+      it('does inform the user that a simulation of the transaction failed', () => {
         const { queryByText } = render({
           useGasFeeContextValue: {
             supportsEIP1559: false,
@@ -405,7 +356,7 @@ describe('TransactionAlerts', () => {
           queryByText(
             'We were not able to estimate gas. There might be an error in the contract and this transaction may fail.',
           ),
-        ).not.toBeInTheDocument();
+        ).toBeInTheDocument();
       });
     });
 
@@ -469,29 +420,6 @@ describe('TransactionAlerts', () => {
         ).not.toBeInTheDocument();
       });
     });
-
-    describe('if isNetworkBusy from useGasFeeContext is truthy', () => {
-      it('does not inform the user that the network is busy', () => {
-        const { queryByText } = render({
-          useGasFeeContextValue: {
-            supportsEIP1559: false,
-            isNetworkBusy: true,
-          },
-          componentProps: {
-            txData: {
-              txParams: {
-                value: '0x1',
-              },
-            },
-          },
-        });
-        expect(
-          queryByText(
-            'Network is busy. Gas prices are high and estimates are less accurate.',
-          ),
-        ).not.toBeInTheDocument();
-      });
-    });
   });
 
   describe('when sending zero amount it should display a warning', () => {
diff --git a/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.test.js b/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.test.js
index 5a5d7431c2d0..26a03506737c 100644
--- a/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.test.js
+++ b/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.test.js
@@ -10,6 +10,7 @@ import mockEstimates from '../../../../../test/data/mock-estimates.json';
 import mockState from '../../../../../test/data/mock-state.json';
 import configureStore from '../../../../store/store';
 
+import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
 import TransactionDetail from './transaction-detail.component';
 
 jest.mock('../../../../store/actions', () => ({
@@ -23,13 +24,16 @@ jest.mock('../../../../store/actions', () => ({
   createTransactionEventFragment: jest.fn(),
 }));
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 const render = async ({ componentProps, contextProps } = {}) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
       accounts: {
-        [mockState.metamask.selectedAddress]: {
-          address: mockState.metamask.selectedAddress,
+        [mockSelectedInternalAccount.address]: {
+          address: mockSelectedInternalAccount.address,
           balance: '0x1F4',
         },
       },
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index 3ec563ab4f44..a057069cc20d 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -78,7 +78,7 @@ export default class ConfirmApproveContent extends Component {
     isContract: PropTypes.bool,
     hexTransactionTotal: PropTypes.string,
     hexMinimumTransactionFee: PropTypes.string,
-    isMultiLayerFeeNetwork: PropTypes.bool,
+    hasLayer1GasFee: PropTypes.bool,
     supportsEIP1559: PropTypes.bool,
     assetName: PropTypes.string,
     tokenId: PropTypes.string,
@@ -158,7 +158,7 @@ export default class ConfirmApproveContent extends Component {
       hexTransactionTotal,
       hexMinimumTransactionFee,
       txData,
-      isMultiLayerFeeNetwork,
+      hasLayer1GasFee,
       supportsEIP1559,
       userAcknowledgedGasMissing,
       renderSimulationFailureWarning,
@@ -166,7 +166,7 @@ export default class ConfirmApproveContent extends Component {
       useNativeCurrencyAsPrimaryCurrency,
     } = this.props;
     if (
-      !isMultiLayerFeeNetwork &&
+      !hasLayer1GasFee &&
       supportsEIP1559 &&
       !renderSimulationFailureWarning
     ) {
@@ -178,7 +178,7 @@ export default class ConfirmApproveContent extends Component {
     }
     return (
       <div className="confirm-approve-content__transaction-details-content">
-        {isMultiLayerFeeNetwork ? (
+        {hasLayer1GasFee ? (
           <div className="confirm-approve-content__transaction-details-extra-content">
             <TransactionDetailItem
               key="confirm-approve-content-min-tx-fee"
@@ -552,7 +552,12 @@ export default class ConfirmApproveContent extends Component {
       >
         {
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidBannerAlert txData={txData} margin={4} />
+          <BlockaidBannerAlert
+            txData={txData}
+            marginTop={4}
+            marginLeft={4}
+            marginRight={4}
+          />
           ///: END:ONLY_INCLUDE_IF
         }
         {isSuspiciousResponse(txData?.securityProviderResponse) && (
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
index 6870edef5242..d1a5afcff6dd 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
@@ -94,7 +94,7 @@ export default {
     hexTransactionTotal: {
       control: 'text',
     },
-    isMultiLayerFeeNetwork: {
+    hasLayer1GasFee: {
       control: 'boolean',
     },
     supportsEIP1559: {
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve.js b/ui/pages/confirmations/confirm-approve/confirm-approve.js
index 50340dc8be91..8e7c6423d842 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve.js
@@ -25,7 +25,6 @@ import {
   getNextSuggestedNonce,
   getCurrentChainId,
   getRpcPrefsForCurrentProvider,
-  getIsMultiLayerFeeNetwork,
   checkNetworkAndAccountSupports1559,
   getUseCurrencyRateCheck,
   getPreferences,
@@ -77,7 +76,6 @@ export default function ConfirmApprove({
   const customNonceValue = useSelector(getCustomNonceValue);
   const chainId = useSelector(getCurrentChainId);
   const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
-  const isMultiLayerFeeNetwork = useSelector(getIsMultiLayerFeeNetwork);
   const networkAndAccountSupports1559 = useSelector(
     checkNetworkAndAccountSupports1559,
   );
@@ -142,7 +140,7 @@ export default function ConfirmApprove({
     checkIfContract();
   }, [checkIfContract]);
 
-  const { origin } = transaction;
+  const { origin, layer1GasFee } = transaction;
   const formattedOrigin = origin || '';
 
   const { iconUrl: siteImage = '' } = subjectMetadata[origin] || {};
@@ -203,7 +201,6 @@ export default function ConfirmApprove({
             hexTransactionTotal={hexTransactionTotal}
             hexMinimumTransactionFee={hexMinimumTransactionFee}
             txData={transaction}
-            isMultiLayerFeeNetwork={isMultiLayerFeeNetwork}
             supportsEIP1559={supportsEIP1559}
             userAddress={userAddress}
             tokenAddress={tokenAddress}
@@ -306,7 +303,7 @@ export default function ConfirmApprove({
               chainId={chainId}
               rpcPrefs={rpcPrefs}
               isContract={isContract}
-              isMultiLayerFeeNetwork={isMultiLayerFeeNetwork}
+              hasLayer1GasFee={layer1GasFee !== undefined}
               supportsEIP1559={supportsEIP1559}
               useCurrencyRateCheck={useCurrencyRateCheck}
               useNativeCurrencyAsPrimaryCurrency={
@@ -350,6 +347,7 @@ ConfirmApprove.propTypes = {
   userAddress: PropTypes.string,
   toAddress: PropTypes.string,
   transaction: PropTypes.shape({
+    layer1GasFee: PropTypes.string,
     origin: PropTypes.string,
     txParams: PropTypes.shape({
       data: PropTypes.string,
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve.util.js b/ui/pages/confirmations/confirm-approve/confirm-approve.util.js
index 5f2e0c8becbf..fdd650784633 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve.util.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve.util.js
@@ -28,16 +28,18 @@ export function getCustomTxParamsData(
   if (spender.startsWith('0x')) {
     spender = spender.substring(2);
   }
-  const [signature, tokenValue] = data.split(spender);
-
-  if (!signature || !tokenValue) {
+  const [signature, rest] = data.split(spender);
+  if (!signature || !rest) {
     throw new Error('Invalid data');
-  } else if (tokenValue.length !== 64) {
+  } else if (rest.length < 64) {
     throw new Error(
-      'Invalid token value; should be exactly 64 hex digits long (u256)',
+      'Invalid calldata value; must be at least 64 hex digits long',
     );
   }
 
+  const tokenValue = rest.substring(0, 64);
+  const extraCalldata = rest.substring(64);
+
   let customPermissionValue = decimalToHex(
     calcTokenValue(customPermissionAmount, decimals),
   );
@@ -49,6 +51,6 @@ export function getCustomTxParamsData(
     tokenValue.length,
     '0',
   );
-  const customTxParamsData = `${signature}${spender}${customPermissionValue}`;
+  const customTxParamsData = `${signature}${spender}${customPermissionValue}${extraCalldata}`;
   return customTxParamsData;
 }
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve.util.test.js b/ui/pages/confirmations/confirm-approve/confirm-approve.util.test.js
new file mode 100644
index 000000000000..6e0699f769b7
--- /dev/null
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve.util.test.js
@@ -0,0 +1,40 @@
+import { getCustomTxParamsData } from './confirm-approve.util';
+
+describe('getCustomTxParamsData', () => {
+  it('should handle approvals with calldata tags', async () => {
+    const approvalCalldata =
+      '0x095ea7b3000000000000000000000000fffbf65b0c8045edf8ca269a3b47a6c0b29e0ebf00000000000000000000000000000000000000000000002a1f0a87470e840000fc000023c0';
+    expect(
+      getCustomTxParamsData(approvalCalldata, {
+        customPermissionAmount: '0.1',
+        decimals: 18,
+      }),
+    ).toBe(
+      '0x095ea7b3000000000000000000000000fffbf65b0c8045edf8ca269a3b47a6c0b29e0ebf000000000000000000000000000000000000000000000000016345785d8a0000fc000023c0',
+    );
+  });
+
+  it('should handle approvals without calldata tags', async () => {
+    const approvalCalldata =
+      '0x095ea7b3000000000000000000000000fffbf65b0c8045edf8ca269a3b47a6c0b29e0ebf00000000000000000000000000000000000000000000002a1f0a87470e840000';
+    expect(
+      getCustomTxParamsData(approvalCalldata, {
+        customPermissionAmount: '0.1',
+        decimals: 18,
+      }),
+    ).toBe(
+      '0x095ea7b3000000000000000000000000fffbf65b0c8045edf8ca269a3b47a6c0b29e0ebf000000000000000000000000000000000000000000000000016345785d8a0000',
+    );
+  });
+
+  it('should throw when approval value has invalid length', async () => {
+    const approvalCalldata =
+      '0x095ea7b3000000000000000000000000fffbf65b0c8045edf8ca269a3b47a6c0b29e0ebf00000000000000000000000000000000000000000000002a1f0a87470e8400';
+    expect(() =>
+      getCustomTxParamsData(approvalCalldata, {
+        customPermissionAmount: '0.1',
+        decimals: 18,
+      }),
+    ).toThrow('Invalid data');
+  });
+});
diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
index 80e0fcb1ea1f..fe38fbf65a72 100644
--- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
+++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -80,18 +80,25 @@ exports[`ConfirmSendEther should render correct information for for confirm send
         class="confirm-page-container-header__row"
       >
         <div
-          class="confirm-page-container-header__back-button-container"
-          style="visibility: initial;"
+          class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
+          data-testid="network-display"
         >
+          <div
+            class="chip__left-icon"
+          >
+            <div
+              class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-lg"
+              data-testid="color-icon-icon-muted"
+            >
+              <i
+                class="color-indicator__icon fa fa-question"
+              />
+            </div>
+          </div>
           <span
-            class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
-            style="mask-image: url('./images/icons/arrow-left.svg');"
-          />
-          <span
-            class="confirm-page-container-header__back-button"
-            data-testid="confirm-page-back-edit-button"
+            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-alternative"
           >
-            Edit
+            goerli
           </span>
         </div>
       </div>
@@ -335,7 +342,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
           </div>
         </div>
         <div
-          class="mm-box mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+          class="mm-box simulation-details-layout mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
           data-testid="simulation-details-layout"
         >
           <div
diff --git a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
index 242aa836ea67..1e600744a876 100644
--- a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
+++ b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
@@ -130,6 +130,7 @@ exports[`Confirm Signature Request Component render should match snapshot 1`] =
             </div>
             <div
               class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+              style="height: 16px; width: 16px;"
             >
               <span
                 class="icon-with-fallback__fallback"
diff --git a/ui/pages/confirmations/confirm-signature-request/index.js b/ui/pages/confirmations/confirm-signature-request/index.js
index 5ef1e7c1927b..d1f534eb5a9f 100644
--- a/ui/pages/confirmations/confirm-signature-request/index.js
+++ b/ui/pages/confirmations/confirm-signature-request/index.js
@@ -28,7 +28,7 @@ import {
   getMemoizedCurrentChainId,
   getMemoizedTxId,
 } from '../../../selectors';
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import { useSignatureInsights } from '../../../hooks/snaps/useSignatureInsights';
 ///: END:ONLY_INCLUDE_IF
 import { MESSAGE_TYPE } from '../../../../shared/constants/app';
@@ -200,7 +200,7 @@ const ConfirmTxScreen = ({ match }) => {
     unapprovedTypedMessages,
   ]);
 
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   const { warnings } = useSignatureInsights({ txData });
   ///: END:ONLY_INCLUDE_IF
   const resolvedSecurityAlertResponse =
@@ -233,7 +233,7 @@ const ConfirmTxScreen = ({ match }) => {
       ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
       selectedAccount={selectedAccount}
       ///: END:ONLY_INCLUDE_IF
-      ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+      ///: BEGIN:ONLY_INCLUDE_IF(snaps)
       warnings={warnings}
       ///: END:ONLY_INCLUDE_IF
     />
diff --git a/ui/pages/confirmations/confirm-signature-request/index.test.js b/ui/pages/confirmations/confirm-signature-request/index.test.js
index 829b4aa6c705..8f9376e83911 100644
--- a/ui/pages/confirmations/confirm-signature-request/index.test.js
+++ b/ui/pages/confirmations/confirm-signature-request/index.test.js
@@ -6,13 +6,6 @@ import ConfTx from '.';
 
 const mockState = {
   metamask: {
-    identities: {
-      '0x8eeee1781fd885ff5ddef7789486676961873d12': {
-        address: '0x8eeee1781fd885ff5ddef7789486676961873d12',
-        lastSelected: 1673587189888,
-        name: 'Account 1',
-      },
-    },
     unapprovedMsgs: {},
     unapprovedMsgCount: 0,
     unapprovedPersonalMsgs: {},
diff --git a/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js b/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js
index 8e9a57c3f6e7..7b60bf9ab4fe 100644
--- a/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js
+++ b/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js
@@ -32,6 +32,7 @@ import {
 } from '../../../../shared/modules/conversion.utils';
 import { EtherDenomination } from '../../../../shared/constants/common';
 import { CHAIN_IDS, TEST_CHAINS } from '../../../../shared/constants/network';
+import { ETH_DEFAULT_DECIMALS } from '../../../constants';
 
 export default function ConfirmTokenTransactionBase({
   image = '',
@@ -59,7 +60,7 @@ export default function ConfirmTokenTransactionBase({
 
   const ethTransactionTotalMaxAmount = Number(
     hexWEIToDecETH(hexMaximumTransactionFee),
-  );
+  ).toFixed(ETH_DEFAULT_DECIMALS);
 
   const getTitleTokenDescription = (renderType) => {
     const useBlockExplorer =
diff --git a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index b6ccab941d9b..d19b9ccd02cc 100644
--- a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -307,7 +307,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
               class="transaction-alerts"
             />
             <div
-              class="mm-box mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+              class="mm-box simulation-details-layout mm-box--margin-4 mm-box--padding-3 mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--rounded-md mm-box--border-color-border-default box--border-style-solid box--border-width-1"
               data-testid="simulation-details-layout"
             >
               <div
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
index 170294a129e2..48b298ba74cd 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
@@ -7,7 +7,6 @@ import {
 import ConfirmPageContainer from '../components/confirm-page-container';
 import { isBalanceSufficient } from '../send/send.utils';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
-import fetchEstimatedL1Fee from '../../../helpers/utils/optimism/fetchEstimatedL1Fee';
 
 import {
   INSUFFICIENT_FUNDS_ERROR_KEY,
@@ -21,7 +20,6 @@ import UserPreferencedCurrencyDisplay from '../../../components/app/user-prefere
 
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import TextField from '../../../components/ui/text-field';
-import SimulationErrorMessage from '../components/simulation-error-message';
 import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { getMethodName } from '../../../helpers/utils/metrics';
 import {
@@ -65,8 +63,8 @@ import SnapAccountTransactionLoadingScreen from '../../snap-account-transaction-
 import { isHardwareKeyring } from '../../../helpers/utils/hardware';
 import FeeDetailsComponent from '../components/fee-details-component/fee-details-component';
 import { SimulationDetails } from '../components/simulation-details';
-import { BannerAlert } from '../../../components/component-library';
-import { Severity } from '../../../helpers/constants/design-system';
+import { fetchSwapsFeatureFlags } from '../../swaps/swaps.util';
+import { BlockaidUnavailableBannerAlert } from '../components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert';
 
 export default class ConfirmTransactionBase extends Component {
   static contextTypes = {
@@ -164,16 +162,16 @@ export default class ConfirmTransactionBase extends Component {
     tokenSymbol: PropTypes.string,
     updateTransaction: PropTypes.func,
     updateTransactionValue: PropTypes.func,
+    setSwapsFeatureFlags: PropTypes.func,
+    fetchSmartTransactionsLiveness: PropTypes.func,
     isUsingPaymaster: PropTypes.bool,
     isSigningOrSubmitting: PropTypes.bool,
     isUserOpContractDeployError: PropTypes.bool,
     useMaxValue: PropTypes.bool,
     maxValue: PropTypes.string,
-    isMultiLayerFeeNetwork: PropTypes.bool,
-    hasMigratedFromOpenSeaToBlockaid: PropTypes.bool,
-    hasDismissedOpenSeaToBlockaidBanner: PropTypes.bool,
-    dismissOpenSeaToBlockaidBanner: PropTypes.func,
-    isNetworkSupportedByBlockaid: PropTypes.bool,
+    isSmartTransaction: PropTypes.bool,
+    smartTransactionsOptInStatus: PropTypes.bool,
+    currentChainSupportsSmartTransactions: PropTypes.bool,
     selectedNetworkClientId: PropTypes.string,
   };
 
@@ -185,7 +183,6 @@ export default class ConfirmTransactionBase extends Component {
     editingGas: false,
     userAcknowledgedGasMissing: false,
     showWarningModal: false,
-    estimatedL1Fees: 0,
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     noteText: '',
     ///: END:ONLY_INCLUDE_IF
@@ -205,7 +202,6 @@ export default class ConfirmTransactionBase extends Component {
       setDefaultHomeActiveTabName,
       hexMaximumTransactionFee,
       useMaxValue,
-      txData,
     } = this.props;
     const {
       customNonceValue: prevCustomNonceValue,
@@ -260,21 +256,11 @@ export default class ConfirmTransactionBase extends Component {
       }
     }
 
-    if (hexMaximumTransactionFee !== prevHexMaximumTransactionFee) {
-      fetchEstimatedL1Fee(txData?.chainId, txData)
-        .then((result) => {
-          this.setState({
-            estimatedL1Fees: result,
-          });
-        })
-        .catch((_err) => {
-          this.setState({
-            estimatedL1Fees: 0,
-          });
-        });
-      if (useMaxValue) {
-        this.updateValueToMax();
-      }
+    if (
+      hexMaximumTransactionFee !== prevHexMaximumTransactionFee &&
+      useMaxValue
+    ) {
+      this.updateValueToMax();
     }
   }
 
@@ -399,15 +385,10 @@ export default class ConfirmTransactionBase extends Component {
       useCurrencyRateCheck,
       tokenSymbol,
       isUsingPaymaster,
-      isMultiLayerFeeNetwork,
-      hasMigratedFromOpenSeaToBlockaid,
-      hasDismissedOpenSeaToBlockaidBanner,
-      dismissOpenSeaToBlockaidBanner,
-      isNetworkSupportedByBlockaid,
     } = this.props;
 
     const { t } = this.context;
-    const { userAcknowledgedGasMissing, estimatedL1Fees } = this.state;
+    const { userAcknowledgedGasMissing } = this.state;
 
     const { valid } = this.getErrorKey();
     const isDisabled = () => {
@@ -424,7 +405,7 @@ export default class ConfirmTransactionBase extends Component {
       return sumHexes(
         txData.txParams.value,
         useMaxFee ? hexMaximumTransactionFee : hexMinimumTransactionFee,
-        isMultiLayerFeeNetwork ? estimatedL1Fees : 0,
+        txData.layer1GasFee ?? 0,
       );
     };
 
@@ -506,58 +487,21 @@ export default class ConfirmTransactionBase extends Component {
       </div>
     ) : null;
 
-    const simulationFailureWarning = () => (
-      <div
-        className="confirm-page-container-content__error-container"
-        key="confirm-transaction-base_simulation-error-container"
-      >
-        <SimulationErrorMessage
-          userAcknowledgedGasMissing={userAcknowledgedGasMissing}
-          setUserAcknowledgedGasMissing={() =>
-            this.setUserAcknowledgedGasMissing()
-          }
-        />
-      </div>
-    );
-
     const { simulationData } = txData;
 
     const simulationDetails = (
       <SimulationDetails
         simulationData={simulationData}
         transactionId={txData.id}
+        enableMetrics
       />
     );
 
-    const showOpenSeaToBlockaidBannerAlert =
-      hasMigratedFromOpenSeaToBlockaid &&
-      !isNetworkSupportedByBlockaid &&
-      !hasDismissedOpenSeaToBlockaidBanner;
-    const handleCloseOpenSeaToBlockaidBannerAlert = () => {
-      dismissOpenSeaToBlockaidBanner();
-    };
-
     const showTotals = Boolean(simulationData?.error);
 
     return (
       <div className="confirm-page-container-content__details">
-        {showOpenSeaToBlockaidBannerAlert ? (
-          <BannerAlert
-            severity={Severity.Info}
-            title={t('openSeaToBlockaidTitle')}
-            description={t('openSeaToBlockaidDescription')}
-            actionButtonLabel={t('openSeaToBlockaidBtnLabel')}
-            actionButtonProps={{
-              href: 'https://snaps.metamask.io/transaction-insights',
-              externalLink: true,
-            }}
-            marginBottom={4}
-            marginLeft={4}
-            marginTop={4}
-            marginRight={4}
-            onClose={handleCloseOpenSeaToBlockaidBannerAlert}
-          />
-        ) : null}
+        <BlockaidUnavailableBannerAlert />
         <TransactionAlerts
           txData={txData}
           setUserAcknowledgedGasMissing={() =>
@@ -572,16 +516,13 @@ export default class ConfirmTransactionBase extends Component {
           isUsingPaymaster={isUsingPaymaster}
         />
         {simulationDetails}
-        <TransactionDetail
-          disableEditGasFeeButton
-          disabled={isDisabled()}
-          userAcknowledgedGasMissing={userAcknowledgedGasMissing}
-          onEdit={
-            renderSimulationFailureWarning ? null : () => this.handleEditGas()
-          }
-          rows={[
-            renderSimulationFailureWarning && simulationFailureWarning(),
-            !renderSimulationFailureWarning && (
+        {!renderSimulationFailureWarning && (
+          <TransactionDetail
+            disableEditGasFeeButton
+            disabled={isDisabled()}
+            userAcknowledgedGasMissing={userAcknowledgedGasMissing}
+            onEdit={() => this.handleEditGas()}
+            rows={[
               <div key="confirm-transaction-base_confirm-gas-display">
                 <ConfirmGasDisplay
                   userAcknowledgedGasMissing={userAcknowledgedGasMissing}
@@ -590,10 +531,10 @@ export default class ConfirmTransactionBase extends Component {
                   useCurrencyRateCheck={useCurrencyRateCheck}
                   txData={txData}
                 />
-              </div>
-            ),
-          ]}
-        />
+              </div>,
+            ]}
+          />
+        )}
         {showTotals && (
           <TransactionDetail
             disableEditGasFeeButton
@@ -745,8 +686,11 @@ export default class ConfirmTransactionBase extends Component {
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       fromInternalAccount,
       ///: END:ONLY_INCLUDE_IF
+      isSmartTransaction,
     } = this.props;
 
+    const hideLoadingIndicator = isSmartTransaction;
+
     let loadingIndicatorMessage;
 
     switch (keyringForAccount?.type) {
@@ -792,11 +736,7 @@ export default class ConfirmTransactionBase extends Component {
       () => {
         this._removeBeforeUnload();
 
-        sendTransaction(
-          txData,
-          false, // hideLoadingIndicator
-          loadingIndicatorMessage, // loadingIndicatorMessage
-        )
+        sendTransaction(txData, hideLoadingIndicator, loadingIndicatorMessage)
           .then(() => {
             if (!this._isMounted) {
               return;
@@ -998,13 +938,17 @@ export default class ConfirmTransactionBase extends Component {
     window.removeEventListener('beforeunload', this._beforeUnloadForGasPolling);
   };
 
-  componentDidMount() {
+  async componentDidMount() {
     this._isMounted = true;
     const {
       toAddress,
       txData: { origin } = {},
       getNextNonce,
       tryReverseResolveAddress,
+      smartTransactionsOptInStatus,
+      currentChainSupportsSmartTransactions,
+      setSwapsFeatureFlags,
+      fetchSmartTransactionsLiveness,
     } = this.props;
     const { trackEvent } = this.context;
     trackEvent({
@@ -1042,6 +986,16 @@ export default class ConfirmTransactionBase extends Component {
     });
 
     window.addEventListener('beforeunload', this._beforeUnloadForGasPolling);
+
+    if (smartTransactionsOptInStatus && currentChainSupportsSmartTransactions) {
+      // TODO: Fetching swaps feature flags, which include feature flags for smart transactions, is only a short-term solution.
+      // Long-term, we want to have a new proxy service specifically for feature flags.
+      const [swapsFeatureFlags] = await Promise.all([
+        fetchSwapsFeatureFlags(),
+        fetchSmartTransactionsLiveness(),
+      ]);
+      await setSwapsFeatureFlags(swapsFeatureFlags);
+    }
   }
 
   componentWillUnmount() {
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
index f36a9a0a8b0e..5e381e2db35f 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
@@ -25,7 +25,8 @@ import {
   addToAddressBook,
   updateTransaction,
   updateEditableParams,
-  dismissOpenSeaToBlockaidBanner,
+  setSwapsFeatureFlags,
+  fetchSmartTransactionsLiveness,
 } from '../../../store/actions';
 import { isBalanceSufficient } from '../send/send.utils';
 import { shortenAddress, valuesFor } from '../../../helpers/utils/util';
@@ -44,7 +45,6 @@ import {
   getPreferences,
   doesAddressRequireLedgerHidConnection,
   getTokenList,
-  getIsMultiLayerFeeNetwork,
   getIsBuyableChain,
   getEnsResolutionByAddress,
   getUnapprovedTransaction,
@@ -53,11 +53,12 @@ import {
   getUnapprovedTransactions,
   getInternalAccountByAddress,
   getApprovedAndSignedTransactions,
-  getHasDismissedOpenSeaToBlockaidBanner,
-  getHasMigratedFromOpenSeaToBlockaid,
-  getIsNetworkSupportedByBlockaid,
   getSelectedNetworkClientId,
 } from '../../../selectors';
+import {
+  getCurrentChainSupportsSmartTransactions,
+  getSmartTransactionsOptInStatus,
+} from '../../../../shared/modules/selectors';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import {
   isAddressLedger,
@@ -161,6 +162,9 @@ const mapStateToProps = (state, ownProps) => {
     data,
   } = (transaction && transaction.txParams) || txParams;
   const accounts = getMetaMaskAccounts(state);
+  const smartTransactionsOptInStatus = getSmartTransactionsOptInStatus(state);
+  const currentChainSupportsSmartTransactions =
+    getCurrentChainSupportsSmartTransactions(state);
 
   const transactionData = parseStandardTokenTransactionData(data);
   const tokenToAddress = getTokenAddressParam(transactionData);
@@ -261,7 +265,6 @@ const mapStateToProps = (state, ownProps) => {
   const hardwareWalletRequiresConnection =
     doesAddressRequireLedgerHidConnection(state, fromAddress);
 
-  const isMultiLayerFeeNetwork = getIsMultiLayerFeeNetwork(state);
   const isUsingPaymaster = getIsUsingPaymaster(state);
 
   let isSigningOrSubmitting = Boolean(
@@ -275,12 +278,6 @@ const mapStateToProps = (state, ownProps) => {
   const isUserOpContractDeployError =
     fullTxData.isUserOperation && type === TransactionType.deployContract;
 
-  const hasMigratedFromOpenSeaToBlockaid =
-    getHasMigratedFromOpenSeaToBlockaid(state);
-  const hasDismissedOpenSeaToBlockaidBanner =
-    getHasDismissedOpenSeaToBlockaidBanner(state);
-  const isNetworkSupportedByBlockaid = getIsNetworkSupportedByBlockaid(state);
-
   return {
     balance,
     fromAddress,
@@ -328,7 +325,6 @@ const mapStateToProps = (state, ownProps) => {
     showLedgerSteps: fromAddressIsLedger,
     nativeCurrency,
     hardwareWalletRequiresConnection,
-    isMultiLayerFeeNetwork,
     chainId,
     isBuyableChain,
     useCurrencyRateCheck: getUseCurrencyRateCheck(state),
@@ -341,6 +337,8 @@ const mapStateToProps = (state, ownProps) => {
     isUserOpContractDeployError,
     useMaxValue,
     maxValue,
+    smartTransactionsOptInStatus,
+    currentChainSupportsSmartTransactions,
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     accountType,
     isNoteToTraderSupported,
@@ -348,9 +346,6 @@ const mapStateToProps = (state, ownProps) => {
     custodianPublishesTransaction,
     rpcUrl,
     ///: END:ONLY_INCLUDE_IF
-    hasMigratedFromOpenSeaToBlockaid,
-    hasDismissedOpenSeaToBlockaidBanner,
-    isNetworkSupportedByBlockaid,
   };
 };
 
@@ -398,6 +393,12 @@ export const mapDispatchToProps = (dispatch) => {
     updateTransactionValue: (id, value) => {
       dispatch(updateEditableParams(id, { value }));
     },
+    setSwapsFeatureFlags: (swapsFeatureFlags) => {
+      dispatch(setSwapsFeatureFlags(swapsFeatureFlags));
+    },
+    fetchSmartTransactionsLiveness: () => {
+      dispatch(fetchSmartTransactionsLiveness());
+    },
     getNextNonce: () => dispatch(getNextNonce()),
     setDefaultHomeActiveTabName: (tabName) =>
       dispatch(setDefaultHomeActiveTabName(tabName)),
@@ -441,8 +442,6 @@ export const mapDispatchToProps = (dispatch) => {
     setWaitForConfirmDeepLinkDialog: (wait) =>
       dispatch(mmiActions.setWaitForConfirmDeepLinkDialog(wait)),
     ///: END:ONLY_INCLUDE_IF
-    dismissOpenSeaToBlockaidBanner: () =>
-      dispatch(dismissOpenSeaToBlockaidBanner()),
   };
 };
 
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
index 600683d892c5..e567aca60397 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
@@ -100,7 +100,6 @@ const baseStore = {
       medium: '1',
       fast: '2',
     },
-    selectedAddress: mockTxParamsFromAddress,
     keyrings: [
       {
         type: KeyringType.hdKeyTree,
@@ -140,12 +139,6 @@ const baseStore = {
         address: mockTxParamsFromAddress,
       },
     },
-    identities: {
-      [mockTxParamsFromAddress]: { address: mockTxParamsFromAddress },
-      [mockTxParamsToAddress]: {
-        name: 'Test Address 1',
-      },
-    },
     internalAccounts: {
       accounts: {
         'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -339,7 +332,7 @@ describe('Confirm Transaction Base', () => {
     expect(securityProviderBanner).toBeInTheDocument();
   });
 
-  it('should contain L1 L2 fee details for optimism', async () => {
+  it('should estimated fee details for optimism', async () => {
     const state = {
       metamask: {
         ...baseStore.metamask,
@@ -353,14 +346,14 @@ describe('Confirm Transaction Base', () => {
         txData: {
           ...baseStore.confirmTransaction.txData,
           chainId: CHAIN_IDS.OPTIMISM,
+          layer1GasFee: '0x1',
         },
       },
     };
 
     const { queryByText } = await render({ state });
 
-    expect(queryByText('Layer 1 fees')).toBeInTheDocument();
-    expect(queryByText('Layer 2 gas fee')).toBeInTheDocument();
+    expect(queryByText('Estimated fee')).not.toBeInTheDocument();
   });
 
   it('should render NoteToTrader when isNoteToTraderSupported is true', async () => {
diff --git a/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js b/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js
index a7afdbc684f2..3596652e56ef 100644
--- a/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js
+++ b/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js
@@ -2,6 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { Switch, Route, useHistory } from 'react-router-dom';
+
+import { sumHexes } from '../../../../shared/modules/conversion.utils';
 import {
   CONFIRM_APPROVE_PATH,
   CONFIRM_INCREASE_ALLOWANCE_PATH,
@@ -24,8 +26,10 @@ import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/conf
 import { useAssetDetails } from '../hooks/useAssetDetails';
 
 export default function ConfirmTokenTransactionSwitch({ transaction }) {
-  const { txParams: { data, to: tokenAddress, from: userAddress } = {} } =
-    transaction;
+  const {
+    txParams: { data, to: tokenAddress, from: userAddress } = {},
+    layer1GasFee,
+  } = transaction;
 
   const dispatch = useDispatch();
   const history = useHistory();
@@ -171,7 +175,10 @@ export default function ConfirmTokenTransactionSwitch({ transaction }) {
             transaction={transaction}
             ethTransactionTotal={ethTransactionTotal}
             fiatTransactionTotal={fiatTransactionTotal}
-            hexMaximumTransactionFee={hexMaximumTransactionFee}
+            hexMaximumTransactionFee={sumHexes(
+              hexMaximumTransactionFee,
+              layer1GasFee ?? 0x0,
+            )}
           />
         )}
       />
@@ -212,5 +219,6 @@ ConfirmTokenTransactionSwitch.propTypes = {
       to: PropTypes.string,
       from: PropTypes.string,
     }),
+    layer1GasFee: PropTypes.number,
   }),
 };
diff --git a/ui/pages/confirmations/confirm-transaction/confirm-transaction.component.js b/ui/pages/confirmations/confirm-transaction/confirm-transaction.component.js
index 41f31a856301..27b1e59fbe7a 100644
--- a/ui/pages/confirmations/confirm-transaction/confirm-transaction.component.js
+++ b/ui/pages/confirmations/confirm-transaction/confirm-transaction.component.js
@@ -1,20 +1,8 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Switch, Route, useHistory, useParams } from 'react-router-dom';
-
-import Loading from '../../../components/ui/loading-screen';
-import ConfirmContractInteraction from '../confirm-contract-interaction';
-import ConfirmDeployContract from '../confirm-deploy-contract';
-import ConfirmDecryptMessage from '../../confirm-decrypt-message';
-import ConfirmEncryptionPublicKey from '../../confirm-encryption-public-key';
-import ConfirmSendEther from '../confirm-send-ether';
-import ConfirmTransactionSwitch from '../confirm-transaction-switch';
-
+import { Route, Switch, useHistory, useParams } from 'react-router-dom';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
-
-///: BEGIN:ONLY_INCLUDE_IF(conf-redesign)
-import useCurrentConfirmation from '../hooks/useCurrentConfirmation';
-///: END:ONLY_INCLUDE_IF
+import Loading from '../../../components/ui/loading-screen';
 import {
   clearConfirmTransaction,
   setTransactionToConfirm,
@@ -32,24 +20,29 @@ import {
   SIGNATURE_REQUEST_PATH,
 } from '../../../helpers/constants/routes';
 import { isTokenMethodAction } from '../../../helpers/utils/transactions.util';
+import usePolling from '../../../hooks/usePolling';
 import { usePrevious } from '../../../hooks/usePrevious';
 import {
-  unconfirmedTransactionsListSelector,
+  getSelectedNetworkClientId,
   unconfirmedTransactionsHashSelector,
+  unconfirmedTransactionsListSelector,
   use4ByteResolutionSelector,
-  getSelectedNetworkClientId,
 } from '../../../selectors';
 import {
-  getContractMethodData,
-  setDefaultHomeActiveTabName,
   gasFeeStartPollingByNetworkClientId,
   gasFeeStopPollingByPollingToken,
+  getContractMethodData,
+  setDefaultHomeActiveTabName,
 } from '../../../store/actions';
+import ConfirmDecryptMessage from '../../confirm-decrypt-message';
+import ConfirmEncryptionPublicKey from '../../confirm-encryption-public-key';
+import ConfirmContractInteraction from '../confirm-contract-interaction';
+import ConfirmDeployContract from '../confirm-deploy-contract';
+import ConfirmSendEther from '../confirm-send-ether';
 import ConfirmSignatureRequest from '../confirm-signature-request';
-///: BEGIN:ONLY_INCLUDE_IF(conf-redesign)
+import ConfirmTransactionSwitch from '../confirm-transaction-switch';
 import Confirm from '../confirm/confirm';
-///: END:ONLY_INCLUDE_IF
-import usePolling from '../../../hooks/usePolling';
+import useCurrentConfirmation from '../hooks/useCurrentConfirmation';
 import ConfirmTokenTransactionSwitch from './confirm-token-transaction-switch';
 
 const ConfirmTransaction = () => {
@@ -77,10 +70,7 @@ const ConfirmTransaction = () => {
   ]);
   const [transaction, setTransaction] = useState(getTransaction);
   const use4ByteResolution = useSelector(use4ByteResolutionSelector);
-
-  ///: BEGIN:ONLY_INCLUDE_IF(conf-redesign)
   const { currentConfirmation } = useCurrentConfirmation();
-  ///: END:ONLY_INCLUDE_IF
 
   useEffect(() => {
     const tx = getTransaction();
@@ -170,7 +160,6 @@ const ConfirmTransaction = () => {
     use4ByteResolution,
   ]);
 
-  ///: BEGIN:ONLY_INCLUDE_IF(conf-redesign)
   // Code below is required as we need to support both new and old confirmation pages,
   // It takes care to render <Confirm /> component for confirmations of type Personal Sign.
   // Once we migrate all confirmations to new designs we can get rid of this code
@@ -178,7 +167,6 @@ const ConfirmTransaction = () => {
   if (currentConfirmation) {
     return <Confirm />;
   }
-  ///: END:ONLY_INCLUDE_IF
 
   if (isValidTokenMethod && isValidTransactionId) {
     return <ConfirmTokenTransactionSwitch transaction={transaction} />;
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index 2b33a42df285..0d1fdb5aaaed 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
     class="mm-box multichain-page mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
   >
     <div
-      class="mm-box multichain-page__inner-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
+      class="mm-box multichain-page__inner-container confirm_wrapper mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
     >
       <div
         class="mm-box confirm_header__wrapper mm-box--display-flex mm-box--justify-content-space-between mm-box--align-items-center"
@@ -71,7 +71,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
             class="mm-box mm-box--margin-inline-start-4"
           >
             <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-default"
             />
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
@@ -99,6 +99,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
                 <button
                   aria-label="Account details"
                   class="mm-box mm-button-icon mm-button-icon--size-md mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+                  data-testid="header-info-button"
                 >
                   <span
                     class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
@@ -111,7 +112,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
         </div>
       </div>
       <div
-        class="mm-box mm-box--margin-bottom-4 mm-box--padding-4 mm-box--display-flex mm-box--width-full mm-box--background-color-primary-muted"
+        class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--width-full mm-box--background-color-primary-muted"
       >
         <span
           class="mm-box mm-icon mm-icon--size-md mm-box--margin-right-2 mm-box--display-inline-block mm-box--color-info-default"
@@ -124,104 +125,97 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
         </p>
       </div>
       <div
-        class="mm-box multichain-page-content mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
+        class="mm-box mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
+        style="min-height: 0; overflow: hidden; position: relative;"
       >
-        <h2
-          class="mm-box mm-text mm-text--heading-lg mm-text--text-align-center mm-box--padding-top-4 mm-box--padding-bottom-2 mm-box--color-text-default"
-        >
-          Signature request
-        </h2>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-bottom-4 mm-box--color-text-alternative"
-        >
-          Only sign this message if you fully understand the content and trust the requesting site
-        </p>
         <div
-          class="mm-box mm-box--width-full mm-box--height-full"
-          style="min-height: 0; position: relative;"
+          class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
+          style="overflow: auto;"
         >
+          <h2
+            class="mm-box mm-text mm-text--heading-lg mm-text--text-align-center mm-box--padding-top-4 mm-box--padding-bottom-2 mm-box--color-text-default"
+          >
+            Signature request
+          </h2>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-bottom-4 mm-box--color-text-alternative"
+          >
+            Only confirm this message if you approve the content and trust the requesting site.
+          </p>
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
-            style="overflow: auto;"
+            class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
           >
             <div
-              class="mm-box mm-box--padding-4"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px;"
             >
               <div
-                class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
+                  Request from
+                </p>
+                <div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    aria-describedby="tippy-tooltip-3"
+                    class=""
+                    data-original-title="This is the site asking for your signature."
+                    data-tooltipped=""
+                    style="display: flex;"
+                    tabindex="0"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                    >
-                      Request from
-                    </p>
-                    <div>
-                      <div
-                        aria-describedby="tippy-tooltip-3"
-                        class=""
-                        data-original-title="This is the site asking for your signature."
-                        data-tooltipped=""
-                        style="display: flex;"
-                        tabindex="0"
-                      >
-                        <span
-                          class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
-                          style="mask-image: url('./images/icons/question.svg');"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
-                  >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                    >
-                      https://metamask.github.io
-                    </p>
+                    <span
+                      class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+                      style="mask-image: url('./images/icons/question.svg');"
+                    />
                   </div>
                 </div>
               </div>
               <div
-                class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
               >
-                <div
-                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
                 >
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                  >
-                    <p
-                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                    >
-                      Message
-                    </p>
-                  </div>
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
-                  >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                    >
-                      Example \`personal_sign\` message
-                    </p>
-                  </div>
-                </div>
+                  metamask.github.io
+                </p>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+          >
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  Message
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                  style="white-space: pre-wrap;"
+                >
+                  Example \`personal_sign\` message
+                </p>
               </div>
             </div>
           </div>
         </div>
       </div>
       <div
-        class="mm-box multichain-page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
+        class="mm-box multichain-page-footer confirm-footer_page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
       >
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
@@ -246,7 +240,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
     class="mm-box multichain-page mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
   >
     <div
-      class="mm-box multichain-page__inner-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
+      class="mm-box multichain-page__inner-container confirm_wrapper mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
     >
       <div
         class="mm-box confirm_header__wrapper mm-box--display-flex mm-box--justify-content-space-between mm-box--align-items-center"
@@ -311,7 +305,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
             class="mm-box mm-box--margin-inline-start-4"
           >
             <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+              class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-default"
             />
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
@@ -339,6 +333,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                 <button
                   aria-label="Account details"
                   class="mm-box mm-button-icon mm-button-icon--size-md mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+                  data-testid="header-info-button"
                 >
                   <span
                     class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
@@ -351,7 +346,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
         </div>
       </div>
       <div
-        class="mm-box mm-box--margin-bottom-4 mm-box--padding-4 mm-box--display-flex mm-box--width-full mm-box--background-color-primary-muted"
+        class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--width-full mm-box--background-color-primary-muted"
       >
         <span
           class="mm-box mm-icon mm-icon--size-md mm-box--margin-right-2 mm-box--display-inline-block mm-box--color-info-default"
@@ -364,148 +359,158 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
         </p>
       </div>
       <div
-        class="mm-box multichain-page-content mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
+        class="mm-box mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
+        style="min-height: 0; overflow: hidden; position: relative;"
       >
-        <h2
-          class="mm-box mm-text mm-text--heading-lg mm-text--text-align-center mm-box--padding-top-4 mm-box--padding-bottom-2 mm-box--color-text-default"
-        >
-          Signature request
-        </h2>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-bottom-4 mm-box--color-text-alternative"
-        >
-          Review everything below before continuing. Once done, this transaction can’t be undone
-        </p>
         <div
-          class="mm-box mm-box--width-full mm-box--height-full"
-          style="min-height: 0; position: relative;"
+          class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
+          style="overflow: auto;"
         >
+          <h2
+            class="mm-box mm-text mm-text--heading-lg mm-text--text-align-center mm-box--padding-top-4 mm-box--padding-bottom-2 mm-box--color-text-default"
+          >
+            Signature request
+          </h2>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-bottom-4 mm-box--color-text-alternative"
+          >
+            Only confirm this message if you approve the content and trust the requesting site.
+          </p>
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
-            style="overflow: auto;"
+            class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
           >
             <div
-              class="mm-box mm-box--padding-4"
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px;"
             >
               <div
-                class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
               >
-                <div
-                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                 >
+                  Request from
+                </p>
+                <div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    aria-describedby="tippy-tooltip-5"
+                    class=""
+                    data-original-title="This is the site asking for your signature."
+                    data-tooltipped=""
+                    style="display: flex;"
+                    tabindex="0"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                    >
-                      Request from
-                    </p>
-                    <div>
-                      <div
-                        aria-describedby="tippy-tooltip-5"
-                        class=""
-                        data-original-title="This is the site asking for your signature."
-                        data-tooltipped=""
-                        style="display: flex;"
-                        tabindex="0"
-                      >
-                        <span
-                          class="mm-box mm-icon mm-icon--size-md mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
-                          style="mask-image: url('./images/icons/question.svg');"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
-                  >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                    >
-                      https://metamask.github.io
-                    </p>
+                    <span
+                      class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+                      style="mask-image: url('./images/icons/question.svg');"
+                    />
                   </div>
                 </div>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                >
+                  metamask.github.io
+                </p>
+              </div>
+            </div>
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  Interacting with
+                </p>
+              </div>
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+              >
                 <div
-                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                  >
-                    <p
-                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                    >
-                      Interacting with
-                    </p>
-                  </div>
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                   >
                     <div
-                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                      class="mm-avatar-account__jazzicon"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
                       >
-                        <div
-                          class="mm-avatar-account__jazzicon"
+                        <svg
+                          height="16"
+                          width="16"
+                          x="0"
+                          y="0"
                         >
-                          <div
-                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
-                          >
-                            <svg
-                              height="16"
-                              width="16"
-                              x="0"
-                              y="0"
-                            >
-                              <rect
-                                fill="#FB1891"
-                                height="16"
-                                transform="translate(0.6335263099240563 1.7352552986765108) rotate(129.9 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#F90901"
-                                height="16"
-                                transform="translate(-5.227286615169763 8.640359200885621) rotate(141.5 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                              <rect
-                                fill="#F26A02"
-                                height="16"
-                                transform="translate(10.585940898259892 -4.814122444807073) rotate(339.2 8 8)"
-                                width="16"
-                                x="0"
-                                y="0"
-                              />
-                            </svg>
-                          </div>
-                        </div>
+                          <rect
+                            fill="#FB1891"
+                            height="16"
+                            transform="translate(0.6335263099240563 1.7352552986765108) rotate(129.9 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#F90901"
+                            height="16"
+                            transform="translate(-5.227286615169763 8.640359200885621) rotate(141.5 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#F26A02"
+                            height="16"
+                            transform="translate(10.585940898259892 -4.814122444807073) rotate(339.2 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                        </svg>
                       </div>
-                      <p
-                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                        data-testid="confirm-info-row-display-name"
-                      >
-                        0xCcCCc...ccccC
-                      </p>
                     </div>
                   </div>
+                  <p
+                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                    data-testid="confirm-info-row-display-name"
+                  >
+                    0xCcCCc...ccccC
+                  </p>
                 </div>
               </div>
+            </div>
+          </div>
+          <div
+            class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+          >
+            <div
+              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+              style="overflow-wrap: anywhere; min-height: 24px;"
+            >
+              <div
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                >
+                  Message
+                </p>
+              </div>
               <div
-                class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
+                class="mm-box mm-box--width-full"
               >
                 <div
                   class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                  style="overflow-wrap: anywhere; min-height: 24px;"
+                  style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -513,16 +518,30 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                     >
-                      Message
+                      Primary type:
                     </p>
                   </div>
+                  <div
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      Mail
+                    </p>
+                  </div>
+                </div>
+                <div
+                  class="mm-box"
+                  style="margin-left: -8px;"
+                >
                   <div
                     class="mm-box mm-box--width-full"
-                    style="margin: 0px -8px;"
                   >
                     <div
                       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                      style="overflow-wrap: anywhere; min-height: 24px;"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
                         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -530,7 +549,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                         >
-                          Primary type:
+                          Contents:
                         </p>
                       </div>
                       <div
@@ -538,21 +557,31 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                          style="white-space: pre-wrap;"
                         >
-                          Mail
+                          Hello, Bob!
                         </p>
                       </div>
                     </div>
                     <div
-                      class="mm-box"
-                      style="margin: 0px -8px;"
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--margin-left-2"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          From:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--width-full"
                       >
                         <div
                           class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                          style="overflow-wrap: anywhere; min-height: 24px;"
+                          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
                             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -560,7 +589,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                             <p
                               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                             >
-                              Contents:
+                              Name:
                             </p>
                           </div>
                           <div
@@ -568,43 +597,31 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                              style="white-space: pre-wrap;"
                             >
-                              Hello, Bob!
+                              Cow
                             </p>
                           </div>
                         </div>
                         <div
-                          class="mm-box mm-box--margin-left-2"
+                          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                            style="overflow-wrap: anywhere; min-height: 24px;"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                           >
-                            <div
-                              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
-                            >
-                              <p
-                                class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                              >
-                                Name:
-                              </p>
-                            </div>
-                            <div
-                              class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                            <p
+                              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                             >
-                              <p
-                                class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                              >
-                                Cow
-                              </p>
-                            </div>
+                              Wallets:
+                            </p>
                           </div>
                           <div
-                            class="mm-box mm-box--margin-left-2"
+                            class="mm-box mm-box--width-full"
                           >
                             <div
                               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                              style="overflow-wrap: anywhere; min-height: 24px;"
+                              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
                                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -675,7 +692,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                             </div>
                             <div
                               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                              style="overflow-wrap: anywhere; min-height: 24px;"
+                              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
                                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -746,7 +763,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                             </div>
                             <div
                               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                              style="overflow-wrap: anywhere; min-height: 24px;"
+                              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
                                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -817,15 +834,43 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                             </div>
                           </div>
                         </div>
+                      </div>
+                    </div>
+                    <div
+                      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+                    >
+                      <div
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                        >
+                          To:
+                        </p>
+                      </div>
+                      <div
+                        class="mm-box mm-box--width-full"
+                      >
                         <div
-                          class="mm-box mm-box--margin-left-2"
+                          class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                          style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box mm-box--margin-left-2"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                            >
+                              0:
+                            </p>
+                          </div>
+                          <div
+                            class="mm-box mm-box--width-full"
                           >
                             <div
                               class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                              style="overflow-wrap: anywhere; min-height: 24px;"
+                              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
                                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
@@ -841,224 +886,239 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                               >
                                 <p
                                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                                  style="white-space: pre-wrap;"
                                 >
                                   Bob
                                 </p>
                               </div>
                             </div>
                             <div
-                              class="mm-box mm-box--margin-left-2"
+                              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                              style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
-                                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                                style="overflow-wrap: anywhere; min-height: 24px;"
+                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                               >
-                                <div
-                                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                <p
+                                  class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
                                 >
-                                  <p
-                                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                                  >
-                                    0:
-                                  </p>
-                                </div>
+                                  Wallets:
+                                </p>
+                              </div>
+                              <div
+                                class="mm-box mm-box--width-full"
+                              >
                                 <div
-                                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
+                                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                                 >
+                                  <div
+                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                  >
+                                    <p
+                                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                                    >
+                                      0:
+                                    </p>
+                                  </div>
                                   <div
                                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                   >
                                     <div
-                                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                     >
                                       <div
-                                        class="mm-avatar-account__jazzicon"
+                                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                                       >
                                         <div
-                                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
+                                          class="mm-avatar-account__jazzicon"
                                         >
-                                          <svg
-                                            height="16"
-                                            width="16"
-                                            x="0"
-                                            y="0"
+                                          <div
+                                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
                                           >
-                                            <rect
-                                              fill="#C8144A"
+                                            <svg
                                               height="16"
-                                              transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
                                               width="16"
                                               x="0"
                                               y="0"
-                                            />
-                                            <rect
-                                              fill="#01878E"
-                                              height="16"
-                                              transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
-                                              width="16"
-                                              x="0"
-                                              y="0"
-                                            />
-                                            <rect
-                                              fill="#1897F2"
-                                              height="16"
-                                              transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
-                                              width="16"
-                                              x="0"
-                                              y="0"
-                                            />
-                                          </svg>
+                                            >
+                                              <rect
+                                                fill="#C8144A"
+                                                height="16"
+                                                transform="translate(3.3716958087807476 -1.5355449411453455) rotate(359.3 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                              <rect
+                                                fill="#01878E"
+                                                height="16"
+                                                transform="translate(-4.56026532072257 -4.118767169186573) rotate(335.8 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                              <rect
+                                                fill="#1897F2"
+                                                height="16"
+                                                transform="translate(-12.66850392914138 2.191919563316492) rotate(275.0 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                            </svg>
+                                          </div>
                                         </div>
                                       </div>
+                                      <p
+                                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                                        data-testid="confirm-info-row-display-name"
+                                      >
+                                        0xbBbBB...bBBbB
+                                      </p>
                                     </div>
-                                    <p
-                                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                                      data-testid="confirm-info-row-display-name"
-                                    >
-                                      0xbBbBB...bBBbB
-                                    </p>
                                   </div>
                                 </div>
-                              </div>
-                              <div
-                                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                                style="overflow-wrap: anywhere; min-height: 24px;"
-                              >
                                 <div
-                                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                                 >
-                                  <p
-                                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                                  <div
+                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                                   >
-                                    1:
-                                  </p>
-                                </div>
-                                <div
-                                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                                >
+                                    <p
+                                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                                    >
+                                      1:
+                                    </p>
+                                  </div>
                                   <div
                                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                   >
                                     <div
-                                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                     >
                                       <div
-                                        class="mm-avatar-account__jazzicon"
+                                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                                       >
                                         <div
-                                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
+                                          class="mm-avatar-account__jazzicon"
                                         >
-                                          <svg
-                                            height="16"
-                                            width="16"
-                                            x="0"
-                                            y="0"
+                                          <div
+                                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
                                           >
-                                            <rect
-                                              fill="#2395E1"
-                                              height="16"
-                                              transform="translate(-1.7353143855136905 0.5115867848025443) rotate(191.9 8 8)"
-                                              width="16"
-                                              x="0"
-                                              y="0"
-                                            />
-                                            <rect
-                                              fill="#F90101"
-                                              height="16"
-                                              transform="translate(1.7169232764557802 -9.276715881533601) rotate(319.8 8 8)"
-                                              width="16"
-                                              x="0"
-                                              y="0"
-                                            />
-                                            <rect
-                                              fill="#F58700"
+                                            <svg
                                               height="16"
-                                              transform="translate(9.91414735179574 5.139720751783702) rotate(180.7 8 8)"
                                               width="16"
                                               x="0"
                                               y="0"
-                                            />
-                                          </svg>
+                                            >
+                                              <rect
+                                                fill="#2395E1"
+                                                height="16"
+                                                transform="translate(-1.7353143855136905 0.5115867848025443) rotate(191.9 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                              <rect
+                                                fill="#F90101"
+                                                height="16"
+                                                transform="translate(1.7169232764557802 -9.276715881533601) rotate(319.8 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                              <rect
+                                                fill="#F58700"
+                                                height="16"
+                                                transform="translate(9.91414735179574 5.139720751783702) rotate(180.7 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                            </svg>
+                                          </div>
                                         </div>
                                       </div>
+                                      <p
+                                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                                        data-testid="confirm-info-row-display-name"
+                                      >
+                                        0xB0Bda...bEa57
+                                      </p>
                                     </div>
-                                    <p
-                                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                                      data-testid="confirm-info-row-display-name"
-                                    >
-                                      0xB0Bda...bEa57
-                                    </p>
                                   </div>
                                 </div>
-                              </div>
-                              <div
-                                class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
-                                style="overflow-wrap: anywhere; min-height: 24px;"
-                              >
                                 <div
-                                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                  class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+                                  style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                                 >
-                                  <p
-                                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                                  <div
+                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
                                   >
-                                    2:
-                                  </p>
-                                </div>
-                                <div
-                                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                                >
+                                    <p
+                                      class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+                                    >
+                                      2:
+                                    </p>
+                                  </div>
                                   <div
                                     class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                   >
                                     <div
-                                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                     >
                                       <div
-                                        class="mm-avatar-account__jazzicon"
+                                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                                       >
                                         <div
-                                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
+                                          class="mm-avatar-account__jazzicon"
                                         >
-                                          <svg
-                                            height="16"
-                                            width="16"
-                                            x="0"
-                                            y="0"
+                                          <div
+                                            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
                                           >
-                                            <rect
-                                              fill="#018E8C"
-                                              height="16"
-                                              transform="translate(3.988074950687866 0.3554940504644344) rotate(177.8 8 8)"
-                                              width="16"
-                                              x="0"
-                                              y="0"
-                                            />
-                                            <rect
-                                              fill="#F29202"
+                                            <svg
                                               height="16"
-                                              transform="translate(-7.220928666254465 -2.4813555582770794) rotate(334.6 8 8)"
                                               width="16"
                                               x="0"
                                               y="0"
-                                            />
-                                            <rect
-                                              fill="#236FE1"
-                                              height="16"
-                                              transform="translate(14.621768557060026 -6.282465882779628) rotate(456.1 8 8)"
-                                              width="16"
-                                              x="0"
-                                              y="0"
-                                            />
-                                          </svg>
+                                            >
+                                              <rect
+                                                fill="#018E8C"
+                                                height="16"
+                                                transform="translate(3.988074950687866 0.3554940504644344) rotate(177.8 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                              <rect
+                                                fill="#F29202"
+                                                height="16"
+                                                transform="translate(-7.220928666254465 -2.4813555582770794) rotate(334.6 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                              <rect
+                                                fill="#236FE1"
+                                                height="16"
+                                                transform="translate(14.621768557060026 -6.282465882779628) rotate(456.1 8 8)"
+                                                width="16"
+                                                x="0"
+                                                y="0"
+                                              />
+                                            </svg>
+                                          </div>
                                         </div>
                                       </div>
+                                      <p
+                                        class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
+                                        data-testid="confirm-info-row-display-name"
+                                      >
+                                        0xB0B0b...00000
+                                      </p>
                                     </div>
-                                    <p
-                                      class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                                      data-testid="confirm-info-row-display-name"
-                                    >
-                                      0xB0B0b...00000
-                                    </p>
                                   </div>
                                 </div>
                               </div>
@@ -1075,7 +1135,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
         </div>
       </div>
       <div
-        class="mm-box multichain-page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
+        class="mm-box multichain-page-footer confirm-footer_page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
       >
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
diff --git a/ui/pages/confirmations/confirm/confirm.tsx b/ui/pages/confirmations/confirm/confirm.tsx
index 33074fe25d81..62a40f568016 100644
--- a/ui/pages/confirmations/confirm/confirm.tsx
+++ b/ui/pages/confirmations/confirm/confirm.tsx
@@ -8,19 +8,20 @@ import { MMISignatureMismatchBanner } from '../../../components/app/mmi-signatur
 ///: END:ONLY_INCLUDE_IF
 import { Nav } from '../components/confirm/nav';
 import { Title } from '../components/confirm/title';
-import { Box } from '../../../components/component-library';
-import { Content, Page } from '../../../components/multichain/pages/page';
-import { BackgroundColor } from '../../../helpers/constants/design-system';
+import { Page } from '../../../components/multichain/pages/page';
 import setCurrentConfirmation from '../hooks/setCurrentConfirmation';
 import syncConfirmPath from '../hooks/syncConfirmPath';
+///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 import { BlockaidAlert } from '../components/confirm/blockaid-alert';
+///: END:ONLY_INCLUDE_IF
+import { LedgerInfo } from '../components/confirm/ledger-info';
 
 const Confirm = () => {
   setCurrentConfirmation();
   syncConfirmPath();
 
   return (
-    <Page backgroundColor={BackgroundColor.backgroundAlternative}>
+    <Page className="confirm_wrapper">
       <Nav />
       <Header />
       {
@@ -28,20 +29,17 @@ const Confirm = () => {
         <MMISignatureMismatchBanner />
         ///: END:ONLY_INCLUDE_IF
       }
-      <Content backgroundColor={BackgroundColor.backgroundAlternative}>
+      <ScrollToBottom>
+        <LedgerInfo />
         {
           // todo: section below is to be removed once new alerts implementation is there
           ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-          <BlockaidAlert />
+          <BlockaidAlert marginTop={4} />
           ///: END:ONLY_INCLUDE_IF
         }
         <Title />
-        <ScrollToBottom>
-          <Box padding={4}>
-            <Info />
-          </Box>
-        </ScrollToBottom>
-      </Content>
+        <Info />
+      </ScrollToBottom>
       <Footer />
     </Page>
   );
diff --git a/ui/pages/confirmations/confirm/index.scss b/ui/pages/confirmations/confirm/index.scss
new file mode 100644
index 000000000000..2f49ce577623
--- /dev/null
+++ b/ui/pages/confirmations/confirm/index.scss
@@ -0,0 +1,9 @@
+@use "design-system";
+
+.confirm_wrapper {
+  box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
+
+  @media screen and (min-width: design-system.$break-small) {
+    max-width: 62%;
+  }
+}
diff --git a/ui/pages/confirmations/confirmation/ResultTemplate.test.ts b/ui/pages/confirmations/confirmation/ResultTemplate.test.ts
index 8bf40a4983e6..b48945c4a57b 100644
--- a/ui/pages/confirmations/confirmation/ResultTemplate.test.ts
+++ b/ui/pages/confirmations/confirmation/ResultTemplate.test.ts
@@ -12,6 +12,8 @@ import { TemplateRendererComponent } from './util';
 const PENDING_APPROVAL_MOCK = {
   id: 'testApprovalId',
   requestData: { testProperty: 'testValue' },
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as ApprovalRequest<any>;
 
 const T_MOCK = () => 'TestLabel';
@@ -182,6 +184,8 @@ describe('ResultTemplate', () => {
 
         expect(
           flattenContent(content).some(
+            // TODO: Replace `any` with type
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             (t: any) =>
               t.key === 'icon' &&
               t.props.iconName === IconName.Confirmation &&
@@ -202,6 +206,8 @@ describe('ResultTemplate', () => {
 
         expect(
           flattenContent(content).some(
+            // TODO: Replace `any` with type
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             (t: any) =>
               t.key === 'icon' &&
               t.props.iconName === IconName.Warning &&
diff --git a/ui/pages/confirmations/confirmation/ResultTemplate.ts b/ui/pages/confirmations/confirmation/ResultTemplate.ts
index 8fc10bdef71e..e7e98a21b7b2 100644
--- a/ui/pages/confirmations/confirmation/ResultTemplate.ts
+++ b/ui/pages/confirmations/confirmation/ResultTemplate.ts
@@ -38,8 +38,12 @@ export class ResultTemplate {
   }
 
   getValues(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     pendingApproval: ApprovalRequest<any>,
     t: (key: string) => string,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     actions: any,
   ) {
     const content = this.#getContent(pendingApproval.requestData || {}, t);
@@ -58,8 +62,12 @@ export class ResultTemplate {
 
   #getContent(
     requestData: SuccessOptions | ErrorOptions,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     t: any,
   ): (undefined | string | TemplateRendererComponent)[] {
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const { error, header, icon, message, title } = requestData as any;
     const isSuccess = this.#type === ApprovalType.ResultSuccess;
 
diff --git a/ui/pages/confirmations/confirmation/confirmation.js b/ui/pages/confirmations/confirmation/confirmation.js
index 5a178b91ae16..c7cbe4ee3ae5 100644
--- a/ui/pages/confirmations/confirmation/confirmation.js
+++ b/ui/pages/confirmations/confirmation/confirmation.js
@@ -17,6 +17,10 @@ import { ApprovalType } from '@metamask/controller-utils';
 ///: END:ONLY_INCLUDE_IF
 import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
 import Box from '../../../components/ui/box';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import MetaMaskTemplateRenderer from '../../../components/app/metamask-template-renderer';
 import ConfirmationWarningModal from '../components/confirmation-warning-modal';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
@@ -456,6 +460,27 @@ export default function ConfirmationPage({
   };
   const handleSubmit = async () => {
     setLoading(true);
+
+    if (
+      pendingConfirmation?.requestData?.fromNetworkConfiguration?.chainId &&
+      pendingConfirmation?.requestData?.toNetworkConfiguration?.chainId
+    ) {
+      trackEvent({
+        category: MetaMetricsEventCategory.Network,
+        event: MetaMetricsEventName.NavNetworkSwitched,
+        properties: {
+          location: 'Switch Modal',
+          from_network:
+            pendingConfirmation.requestData.fromNetworkConfiguration.chainId,
+          to_network:
+            pendingConfirmation.requestData.toNetworkConfiguration.chainId,
+          referrer: {
+            url: window.location.origin,
+          },
+        },
+      });
+    }
+
     if (templateState[pendingConfirmation.id]?.useWarningModal) {
       setShowWarningModal(true);
     } else {
diff --git a/ui/pages/confirmations/confirmation/stories/error.stories.js b/ui/pages/confirmations/confirmation/stories/error.stories.js
index 2f4e08cee37e..dd6fab018425 100644
--- a/ui/pages/confirmations/confirmation/stories/error.stories.js
+++ b/ui/pages/confirmations/confirmation/stories/error.stories.js
@@ -117,7 +117,7 @@ export const TemplateStory = () => {
                 name: 'AccountListItem',
                 key: 'accountListItem',
                 properties: {
-                  identity: {
+                  account: {
                     id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
                     metadata: {
                       name: 'Test Account',
@@ -194,7 +194,7 @@ export const TemplateOnlyStory = () => {
           name: 'AccountListItem',
           key: 'accountListItem',
           properties: {
-            identity: {
+            account: {
               id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
               metadata: {
                 name: 'Test Account',
diff --git a/ui/pages/confirmations/confirmation/stories/success.stories.js b/ui/pages/confirmations/confirmation/stories/success.stories.js
index bc30a754e2ad..bf768a606d10 100644
--- a/ui/pages/confirmations/confirmation/stories/success.stories.js
+++ b/ui/pages/confirmations/confirmation/stories/success.stories.js
@@ -114,7 +114,7 @@ export const TemplateStory = () => {
                 name: 'AccountListItem',
                 key: 'accountListItem',
                 properties: {
-                  identity: {
+                  account: {
                     address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
                     id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
                     metadata: {
@@ -190,7 +190,7 @@ export const TemplateOnlyStory = () => {
           name: 'AccountListItem',
           key: 'accountListItem',
           properties: {
-            identity: {
+            account: {
               address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
               id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
               metadata: {
diff --git a/ui/pages/confirmations/confirmation/stories/util.js b/ui/pages/confirmations/confirmation/stories/util.js
index 2f7449f970ad..3ba31cacaaf3 100644
--- a/ui/pages/confirmations/confirmation/stories/util.js
+++ b/ui/pages/confirmations/confirmation/stories/util.js
@@ -7,6 +7,7 @@ import testData from '../../../../../.storybook/test-data';
 import { Box } from '../../../../components/component-library';
 
 const STORE_MOCK = {
+  ...testData,
   metamask: {
     approvalFlows: [],
     currentCurrency: 'USD',
@@ -41,7 +42,6 @@ const STORE_MOCK = {
     },
     tokenList: {},
     accounts: testData.metamask.accounts,
-    identities: testData.metamask.identities,
     internalAccounts: testData.metamask.internalAccounts,
     accountsByChainId: testData.metamask.accountsByChainId,
     snaps: {
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
index b6e992598cf4..1e3aaa993913 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
@@ -25,7 +25,7 @@ exports[`create-snap-account confirmation should match snapshot 1`] = `
                 class="mm-box mm-text mm-avatar-base mm-avatar-base--size-lg mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
                 style="border-width: 0px;"
               >
-                m
+                T
               </div>
               <div
                 class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-bottom-right"
@@ -48,7 +48,7 @@ exports[`create-snap-account confirmation should match snapshot 1`] = `
             <p
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
             >
-              @metamask/snap-test
+              Test Snap
             </p>
             <p
               class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-alternative"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
index 254e802dfb86..da5dfbf093cf 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
@@ -25,7 +25,7 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
                 class="mm-box mm-text mm-avatar-base mm-avatar-base--size-lg mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
                 style="border-width: 0px;"
               >
-                m
+                T
               </div>
               <div
                 class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-bottom-right"
@@ -48,7 +48,7 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
             <p
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
             >
-              @metamask/snap-test
+              Test Snap
             </p>
             <p
               class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-alternative"
@@ -107,45 +107,168 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
                     class="mm-box multichain-account-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
                   />
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class="mm-box mm-box--display-flex mm-box--sm:display-none"
+                    data-testid="account-list-item-badge"
+                  >
+                    <button
+                      class="mm-box multichain-badge-status mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--background-color-transparent"
+                      data-testid="multichain-badge-status"
+                    >
+                      <div>
+                        <div
+                          aria-describedby="tippy-tooltip-1"
+                          class=""
+                          data-original-title="Not connected"
+                          data-tooltipped=""
+                          style="display: inline;"
+                          tabindex="0"
+                        >
+                          <div
+                            class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+                          >
+                            <div
+                              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            >
+                              <div
+                                class="mm-avatar-account__jazzicon"
+                              >
+                                <div
+                                  style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+                                >
+                                  <svg
+                                    height="32"
+                                    width="32"
+                                    x="0"
+                                    y="0"
+                                  >
+                                    <rect
+                                      fill="#18CDF2"
+                                      height="32"
+                                      transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                                      width="32"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#035E56"
+                                      height="32"
+                                      transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                                      width="32"
+                                      x="0"
+                                      y="0"
+                                    />
+                                    <rect
+                                      fill="#F26602"
+                                      height="32"
+                                      transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                                      width="32"
+                                      x="0"
+                                      y="0"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                            <div
+                              class="mm-box mm-badge-wrapper__badge-container"
+                              style="bottom: -1px; right: 2px;"
+                            >
+                              <div
+                                class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </button>
+                  </div>
+                  <div
+                    class="mm-box mm-box--display-none mm-box--sm:display-flex"
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
                     >
                       <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+                        class="mm-avatar-account__jazzicon"
                       >
-                        <svg
-                          height="32"
-                          width="32"
-                          x="0"
-                          y="0"
+                        <div
+                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
                         >
-                          <rect
-                            fill="#18CDF2"
-                            height="32"
-                            transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
-                            width="32"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#035E56"
+                          <svg
                             height="32"
-                            transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
                             width="32"
                             x="0"
                             y="0"
-                          />
-                          <rect
-                            fill="#F26602"
+                          >
+                            <rect
+                              fill="#18CDF2"
+                              height="32"
+                              transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#035E56"
+                              height="32"
+                              transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#F26602"
+                              height="32"
+                              transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-inline-end-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    >
+                      <div
+                        class="mm-avatar-account__jazzicon"
+                      >
+                        <div
+                          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 58, 0);"
+                        >
+                          <svg
                             height="32"
-                            transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
                             width="32"
                             x="0"
                             y="0"
-                          />
-                        </svg>
+                          >
+                            <rect
+                              fill="#18CDF2"
+                              height="32"
+                              transform="translate(-1.04839350379394 -3.3042840694604987) rotate(328.9 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#035E56"
+                              height="32"
+                              transform="translate(-18.298461708832043 10.5924618717486) rotate(176.2 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                            <rect
+                              fill="#F26602"
+                              height="32"
+                              transform="translate(16.667842018223922 -14.205139722997082) rotate(468.9 16 16)"
+                              width="32"
+                              x="0"
+                              y="0"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
diff --git a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.js b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.js
index ec21317bd90e..9b8b096fd50b 100644
--- a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.js
+++ b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.js
@@ -1,6 +1,9 @@
 import { ethErrors } from 'eth-rpc-errors';
 import React from 'react';
-import { infuraProjectId } from '../../../../../shared/constants/network';
+import {
+  DEPRECATED_NETWORKS,
+  infuraProjectId,
+} from '../../../../../shared/constants/network';
 import {
   Severity,
   TypographyVariant,
@@ -74,6 +77,20 @@ const MISMATCHED_CHAIN_RECOMMENDATION = {
   },
 };
 
+const DEPRECATED_CHAIN_ALERT = {
+  id: 'DEPRECATED_CHAIN_ALERT',
+  severity: Severity.Warning,
+  content: {
+    element: 'span',
+    children: {
+      element: 'MetaMaskTranslation',
+      props: {
+        translationKey: 'deprecatedNetwork',
+      },
+    },
+  },
+};
+
 const MISMATCHED_NETWORK_NAME = {
   id: 'MISMATCHED_NETWORK_NAME',
   severity: Severity.Warning,
@@ -172,6 +189,9 @@ async function getAlerts(pendingApproval, data) {
     ) {
       alerts.push(MISMATCHED_NETWORK_RPC);
     }
+    if (DEPRECATED_NETWORKS.includes(pendingApproval.requestData.chainId)) {
+      alerts.push(DEPRECATED_CHAIN_ALERT);
+    }
   }
 
   if (!data.matchedChain && data.useSafeChainsListValidation) {
@@ -355,14 +375,13 @@ function getValues(pendingApproval, t, actions, history, data) {
           },
           dictionary: {
             [t('networkName')]: pendingApproval.requestData.chainName,
-            [t('networkURL')]: pendingApproval.requestData.rpcUrl?.includes(
-              `/v3/${infuraProjectId}`,
-            )
-              ? pendingApproval.requestData.rpcUrl.replace(
-                  `/v3/${infuraProjectId}`,
-                  '',
-                )
-              : pendingApproval.requestData.rpcUrl,
+            [t('networkURL')]: pendingApproval.requestData.rpcUrl
+              .toLowerCase()
+              ?.includes(`/v3/${infuraProjectId}`)
+              ? pendingApproval.requestData.rpcUrl
+                  .replace(`/v3/${infuraProjectId}`, '')
+                  .toLowerCase()
+              : pendingApproval.requestData.rpcUrl.toLowerCase(),
             [t('chainId')]: parseInt(pendingApproval.requestData.chainId, 16),
             [t('currencySymbol')]: pendingApproval.requestData.ticker,
             [t('blockExplorerUrl')]:
diff --git a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
index bacd44459de9..7b51172dcef2 100644
--- a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
+++ b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
@@ -1,13 +1,15 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import { waitFor } from '@testing-library/react';
+import { waitFor, act } from '@testing-library/react';
 
 import { NetworkStatus } from '@metamask/network-controller';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
 
 import Confirmation from '../confirmation';
+import { CHAIN_IDS } from '../../../../../shared/constants/network';
+import fetchWithCache from '../../../../../shared/lib/fetch-with-cache';
 
 jest.mock('../../../../../shared/lib/fetch-with-cache');
 
@@ -79,4 +81,72 @@ describe('add-ethereum-chain confirmation', () => {
       expect(container).toMatchSnapshot();
     });
   });
+
+  it('should convert RPC URL to lowercase', async () => {
+    const testStore = {
+      metamask: {
+        ...mockBaseStore.metamask,
+        pendingApprovals: {
+          [mockApprovalId]: {
+            ...mockApproval,
+            type: MESSAGE_TYPE.ADD_ETHEREUM_CHAIN,
+            requestData: {
+              ...mockApproval.requestData,
+              rpcUrl: 'https://RPCURL.test.chain',
+            },
+          },
+        },
+      },
+    };
+    const store = configureMockStore(middleware)(testStore);
+    const { getByText } = renderWithProvider(<Confirmation />, store);
+    await waitFor(() => {
+      expect(getByText('https://rpcurl.test.chain')).toBeInTheDocument();
+    });
+  });
+
+  it('should show deprecation alert', async () => {
+    const testStore = {
+      metamask: {
+        ...mockBaseStore.metamask,
+        useSafeChainsListValidation: true,
+        pendingApprovals: {
+          [mockApprovalId]: {
+            ...mockApproval,
+            requestData: {
+              rpcUrl: 'https://rpcurl.test.chain',
+              rpcPrefs: {
+                blockExplorerUrl: 'https://blockexplorer.test.chain',
+              },
+              chainName: 'Test chain',
+              ticker: 'TST',
+              chainId: CHAIN_IDS.LINEA_GOERLI, // mumbai chainId
+              nickname: 'Test chain',
+            },
+            type: MESSAGE_TYPE.ADD_ETHEREUM_CHAIN,
+          },
+        },
+      },
+    };
+
+    const store = configureMockStore(middleware)(testStore);
+    fetchWithCache.mockResolvedValue([
+      {
+        name: 'Linea Goerli',
+        title: 'Linea Goerli Testnet',
+        shortName: 'linea-goerli',
+        chainId: 59140,
+      },
+    ]);
+
+    let result;
+    act(() => {
+      result = renderWithProvider(<Confirmation />, store);
+    });
+    const { getByText } = result;
+
+    await waitFor(() => {
+      expect(getByText('This network is deprecated')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/ui/pages/confirmations/confirmation/templates/create-snap-account.test.js b/ui/pages/confirmations/confirmation/templates/create-snap-account.test.js
index 1bdb2ca31150..d33501b96138 100644
--- a/ui/pages/confirmations/confirmation/templates/create-snap-account.test.js
+++ b/ui/pages/confirmations/confirmation/templates/create-snap-account.test.js
@@ -23,6 +23,7 @@ const mockBaseStore = {
       [mockSnapOrigin]: {
         id: mockSnapOrigin,
         manifest: {
+          proposedName: 'Test Snap',
           description: 'Test Snap',
         },
       },
diff --git a/ui/pages/confirmations/confirmation/templates/index.js b/ui/pages/confirmations/confirmation/templates/index.js
index 4c8a2ed103de..42d48cc7c1b4 100644
--- a/ui/pages/confirmations/confirmation/templates/index.js
+++ b/ui/pages/confirmations/confirmation/templates/index.js
@@ -7,8 +7,14 @@ import {
   setNewNetworkAdded,
   upsertNetworkConfiguration,
 } from '../../../../store/actions';
+import {
+  ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+  SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES,
+  ///: END:ONLY_INCLUDE_IF
+  SMART_TRANSACTION_CONFIRMATION_TYPES,
+} from '../../../../../shared/constants/app';
+import smartTransactionStatusPage from './smart-transaction-status-page';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../../shared/constants/app';
 import createSnapAccount from './create-snap-account';
 import removeSnapAccount from './remove-snap-account';
 import snapAccountRedirect from './snap-account-redirect';
@@ -29,6 +35,8 @@ const APPROVAL_TEMPLATES = {
   // Use ApprovalType from utils controller
   [ApprovalType.ResultSuccess]: success,
   [ApprovalType.ResultError]: error,
+  [SMART_TRANSACTION_CONFIRMATION_TYPES.showSmartTransactionStatusPage]:
+    smartTransactionStatusPage,
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   [ApprovalType.SnapDialogAlert]: snapAlert,
   [ApprovalType.SnapDialogConfirmation]: snapConfirmation,
diff --git a/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js b/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js
index 17cbcf07de6a..5b108e79b29a 100644
--- a/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js
+++ b/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js
@@ -33,6 +33,7 @@ const mockBaseStore = {
       [mockSnapOrigin]: {
         id: mockSnapOrigin,
         manifest: {
+          proposedName: 'Test Snap',
           description: 'Test Snap',
         },
       },
diff --git a/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js b/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
new file mode 100644
index 000000000000..0143e26310ae
--- /dev/null
+++ b/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
@@ -0,0 +1,28 @@
+// eslint-disable-next-line no-unused-vars
+function getValues(pendingApproval, t, actions, _history) {
+  const { id, requestState } = pendingApproval;
+  return {
+    content: [
+      {
+        element: 'SmartTransactionStatusPage',
+        key: 'smart-transaction-status-page',
+        props: {
+          requestState,
+          onCloseExtension: () => {
+            actions.resolvePendingApproval(id, true);
+          },
+          onViewActivity: () => {
+            actions.resolvePendingApproval(id, true);
+          },
+        },
+      },
+    ],
+    hideSubmitButton: true,
+  };
+}
+
+const smartTransactionStatusPage = {
+  getValues,
+};
+
+export default smartTransactionStatusPage;
diff --git a/ui/pages/confirmations/hooks/setCurrentConfirmation.test.tsx b/ui/pages/confirmations/hooks/setCurrentConfirmation.test.tsx
index f03982feef5f..a91713c6942b 100644
--- a/ui/pages/confirmations/hooks/setCurrentConfirmation.test.tsx
+++ b/ui/pages/confirmations/hooks/setCurrentConfirmation.test.tsx
@@ -19,6 +19,8 @@ jest.mock('./useCurrentConfirmation', () => () => ({
   currentConfirmation: mockCurrentConfirmation,
 }));
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const ReduxProvider = Provider as any;
 
 describe('setCurrentConfirmation', () => {
@@ -27,6 +29,8 @@ describe('setCurrentConfirmation', () => {
       ConfirmDucks,
       'updateCurrentConfirmation',
     );
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const wrapper = ({ children }: { children: any }) => (
       <ReduxProvider store={configureStore(mockState)}>
         {children}
diff --git a/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.test.ts b/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.test.ts
index f4523a39e676..741e30394ec0 100644
--- a/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.test.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.test.ts
@@ -4,10 +4,20 @@ import useConfirmationNetworkInfo from './useConfirmationNetworkInfo';
 
 describe('useConfirmationNetworkInfo', () => {
   it('returns display name and image when confirmation chainId is present', () => {
+    const providerConfig = {
+      chainId: '0x1',
+      rpcPrefs: { blockExplorerUrl: 'https://etherscan.io' },
+      ticker: 'ETH',
+      type: 'mainnet',
+    };
     const { result } = renderHookWithProvider(
       () => useConfirmationNetworkInfo(),
       {
         ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          providerConfig,
+        },
         confirm: {
           currentConfirmation: { id: '1', chainId: '0x1' },
         },
@@ -18,7 +28,7 @@ describe('useConfirmationNetworkInfo', () => {
     expect(result.current.networkImageUrl).toBe('./images/eth_logo.svg');
   });
 
-  it('returns display name and image of provider chainId when confirmation chainId is not present', () => {
+  it('returns display name and image for custom network', () => {
     const { result } = renderHookWithProvider(
       () => useConfirmationNetworkInfo(),
       {
@@ -27,6 +37,8 @@ describe('useConfirmationNetworkInfo', () => {
           ...mockState.metamask,
           providerConfig: {
             chainId: '0x7',
+            type: 'rpc',
+            id: 'testNetworkConfigurationId',
           },
           networkConfigurations: {
             ...mockState.metamask.networkConfigurations,
@@ -72,4 +84,45 @@ describe('useConfirmationNetworkInfo', () => {
     expect(result.current.networkDisplayName).toBe('');
     expect(result.current.networkImageUrl).toBe('');
   });
+
+  it('returns correct details about custom network whose chainId is same as a network pre-defined in extension', () => {
+    const customNetwork = {
+      chainId: '0x1',
+      id: '2f9ae569-1d3e-492b-8741-cb10c2434f91',
+      nickname: 'Flashbots Protect',
+      rpcPrefs: { imageUrl: './images/eth_logo.svg' },
+      rpcUrl: 'https://rpc.flashbots.net',
+      ticker: 'ETH',
+      removable: true,
+    };
+    const providerConfig = {
+      chainId: '0x1',
+      id: '2f9ae569-1d3e-492b-8741-cb10c2434f91',
+      nickname: 'Flashbots Protect',
+      rpcPrefs: {},
+      rpcUrl: 'https://rpc.flashbots.net',
+      ticker: 'ETH',
+      type: 'rpc',
+    };
+    const { result } = renderHookWithProvider(
+      () => useConfirmationNetworkInfo(),
+      {
+        ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          providerConfig,
+          networkConfigurations: {
+            ...mockState.metamask.networkConfigurations,
+            [customNetwork.id]: customNetwork,
+          },
+        },
+        confirm: {
+          currentConfirmation: { id: '1', chainId: '0x1' },
+        },
+      },
+    );
+
+    expect(result.current.networkDisplayName).toBe('Flashbots Protect');
+    expect(result.current.networkImageUrl).toBe('./images/eth_logo.svg');
+  });
 });
diff --git a/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts b/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts
index aa7664d19ee7..64fbd815d645 100644
--- a/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts
@@ -16,10 +16,10 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 type KeyOfNetworkName = keyof typeof NETWORK_TO_NAME_MAP;
 
 function useConfirmationNetworkInfo() {
+  const t = useI18nContext();
   const currentConfirmation = useSelector(currentConfirmationSelector);
   const allNetworks = useSelector(getAllNetworks);
   const providerConfig = useSelector(getProviderConfig);
-  const t = useI18nContext();
 
   let networkDisplayName = '';
   let confirmationNetwork;
@@ -29,11 +29,16 @@ function useConfirmationNetworkInfo() {
     const currentChainId =
       currentConfirmation?.chainId ?? providerConfig.chainId;
     confirmationNetwork = allNetworks.find(
-      ({ chainId }) => chainId === currentChainId,
+      ({ id, chainId }) =>
+        chainId === currentChainId &&
+        (providerConfig.type === NETWORK_TYPES.RPC
+          ? id === providerConfig.id
+          : id === providerConfig.type),
     );
+
     if (confirmationNetwork) {
-      const { nickname, providerType, type } = confirmationNetwork;
-      if (providerType === NETWORK_TYPES.RPC || type === NETWORK_TYPES.RPC) {
+      const { nickname } = confirmationNetwork;
+      if (providerConfig.type === NETWORK_TYPES.RPC) {
         networkDisplayName = nickname ?? t('privateNetwork');
       } else {
         networkDisplayName =
diff --git a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts
index 952654ec67fb..9f945230af0c 100644
--- a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts
@@ -1,11 +1,12 @@
 import mockState from '../../../../test/data/mock-state.json';
 import { renderHookWithProvider } from '../../../../test/lib/render-helpers';
+import { getInternalAccountByAddress } from '../../../selectors';
 import useConfirmationRecipientInfo from './useConfirmationRecipientInfo';
 
-const RecipientAddress = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+const SenderAddress = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
 
 describe('useConfirmationRecipientInfo', () => {
-  describe('when the current confirimation is a signature', () => {
+  describe('when the current confirmation is a signature', () => {
     it('returns the account name of the from address as the recipient name', () => {
       const { result } = renderHookWithProvider(
         () => useConfirmationRecipientInfo(),
@@ -14,16 +15,19 @@ describe('useConfirmationRecipientInfo', () => {
           confirm: {
             currentConfirmation: {
               id: '1',
-              msgParams: { from: RecipientAddress },
+              msgParams: { from: SenderAddress },
             },
           },
         },
       );
 
-      expect(result.current.recipientAddress).toBe(RecipientAddress);
-      expect(result.current.recipientName).toBe(
-        mockState.metamask.identities[RecipientAddress].name,
+      const expectedAccount = getInternalAccountByAddress(
+        mockState,
+        SenderAddress,
       );
+
+      expect(result.current.senderAddress).toBe(SenderAddress);
+      expect(result.current.senderName).toBe(expectedAccount.metadata.name);
     });
   });
 
@@ -33,7 +37,7 @@ describe('useConfirmationRecipientInfo', () => {
       mockState,
     );
 
-    expect(result.current.recipientAddress).toBe('');
-    expect(result.current.recipientName).toBe('');
+    expect(result.current.senderAddress).toBe('');
+    expect(result.current.senderName).toBe('');
   });
 });
diff --git a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts
index 358ad8623aa5..2db770f76843 100644
--- a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts
@@ -1,33 +1,31 @@
 import { useSelector } from 'react-redux';
-
+import { getAccountByAddress } from '../../../helpers/utils/util';
 import {
   accountsWithSendEtherInfoSelector,
   currentConfirmationSelector,
 } from '../../../selectors';
-import { getAccountByAddress } from '../../../helpers/utils/util';
+import { getConfirmationSender } from '../components/confirm/utils';
+import { Confirmation } from '../types/confirm';
 
 function useConfirmationRecipientInfo() {
-  const currentConfirmation = useSelector(currentConfirmationSelector);
-  const allAccounts = useSelector(accountsWithSendEtherInfoSelector);
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as Confirmation;
 
-  let recipientAddress = '';
-  let recipientName = '';
+  const allAccounts = useSelector(accountsWithSendEtherInfoSelector);
 
+  let senderAddress, senderName;
   if (currentConfirmation) {
-    const { msgParams } = currentConfirmation;
-    // url for all signature requests
-    if (msgParams) {
-      recipientAddress = msgParams.from;
-      const fromAccount = getAccountByAddress(allAccounts, recipientAddress);
-      recipientName = fromAccount?.metadata?.name;
-    }
-    // TODO: as we add support for more transaction code to find recipient address for different
-    // transaction types will come here
+    const { from } = getConfirmationSender(currentConfirmation);
+    const fromAccount = getAccountByAddress(allAccounts, from);
+
+    senderAddress = from;
+    senderName = fromAccount?.metadata?.name;
   }
 
   return {
-    recipientAddress,
-    recipientName,
+    senderAddress: senderAddress || '',
+    senderName: senderName || '',
   };
 }
 
diff --git a/ui/pages/confirmations/hooks/useCurrentConfirmation.test.ts b/ui/pages/confirmations/hooks/useCurrentConfirmation.test.ts
index af4baa9282bd..78900abdc9b8 100644
--- a/ui/pages/confirmations/hooks/useCurrentConfirmation.test.ts
+++ b/ui/pages/confirmations/hooks/useCurrentConfirmation.test.ts
@@ -1,4 +1,6 @@
 import { ApprovalType } from '@metamask/controller-utils';
+// eslint-disable-next-line import/no-named-as-default
+import Router from 'react-router-dom';
 
 import { renderHookWithProvider } from '../../../../test/lib/render-helpers';
 import useCurrentConfirmation from './useCurrentConfirmation';
@@ -10,6 +12,10 @@ const mockState = {
         id: '1',
         msgParams: {},
       },
+      '2': {
+        id: '2',
+        msgParams: {},
+      },
     },
     pendingApprovals: {
       '1': {
@@ -21,6 +27,18 @@ const mockState = {
         requestState: null,
         expectsResult: false,
       },
+      '2': {
+        id: '2',
+        origin: 'origin',
+        time: Date.now(),
+        type: ApprovalType.EthSignTypedData,
+        requestData: {},
+        requestState: null,
+        expectsResult: false,
+      },
+    },
+    preferences: {
+      redesignedConfirmationsEnabled: true,
     },
   },
 };
@@ -36,4 +54,30 @@ describe('useCurrentConfirmation', () => {
       mockState.metamask.unapprovedPersonalMsgs['1'],
     );
   });
+
+  it('returns confirmation for transaction id present in url', () => {
+    jest.spyOn(Router, 'useParams').mockReturnValue({ id: '2' });
+    const { result } = renderHookWithProvider(
+      () => useCurrentConfirmation(),
+      mockState,
+    );
+
+    expect(result.current.currentConfirmation).toBe(
+      mockState.metamask.unapprovedPersonalMsgs['2'],
+    );
+  });
+
+  it('should not return confirmation if user has not enabled preference for redesigned confirmations', () => {
+    const { result } = renderHookWithProvider(() => useCurrentConfirmation(), {
+      ...mockState,
+      metamask: {
+        ...mockState.metamask,
+        preferences: {
+          redesignedConfirmationsEnabled: false,
+        },
+      },
+    });
+
+    expect(result.current.currentConfirmation).toBe(undefined);
+  });
 });
diff --git a/ui/pages/confirmations/hooks/useCurrentConfirmation.ts b/ui/pages/confirmations/hooks/useCurrentConfirmation.ts
index 10a2121d97ba..9c5f3da505f7 100644
--- a/ui/pages/confirmations/hooks/useCurrentConfirmation.ts
+++ b/ui/pages/confirmations/hooks/useCurrentConfirmation.ts
@@ -1,16 +1,16 @@
-import { useEffect, useState } from 'react';
-import { useParams } from 'react-router-dom';
-import { useSelector } from 'react-redux';
-
 import { ApprovalRequest } from '@metamask/approval-controller';
 import { ApprovalType } from '@metamask/controller-utils';
 import { Json } from '@metamask/utils';
-
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { useParams } from 'react-router-dom';
 import {
+  getRedesignedConfirmationsEnabled,
   latestPendingConfirmationSelector,
   pendingConfirmationsSelector,
   unconfirmedTransactionsHashSelector,
 } from '../../../selectors';
+import { REDESIGN_APPROVAL_TYPES, REDESIGN_TRANSACTION_TYPES } from '../utils';
 
 type Approval = ApprovalRequest<Record<string, Json>>;
 
@@ -27,9 +27,17 @@ const useCurrentConfirmation = () => {
   );
   const [currentConfirmation, setCurrentConfirmation] =
     useState<Record<string, unknown>>();
+  const redesignedConfirmationsEnabled = useSelector(
+    getRedesignedConfirmationsEnabled,
+  );
 
   useEffect(() => {
+    if (!redesignedConfirmationsEnabled) {
+      return;
+    }
+
     let pendingConfirmation: Approval | undefined;
+
     if (paramsTransactionId) {
       if (paramsTransactionId === currentConfirmation?.id) {
         return;
@@ -38,6 +46,7 @@ const useCurrentConfirmation = () => {
         ({ id: confirmId }) => confirmId === paramsTransactionId,
       );
     }
+
     if (!pendingConfirmation) {
       if (!latestPendingConfirmation) {
         setCurrentConfirmation(undefined);
@@ -45,6 +54,7 @@ const useCurrentConfirmation = () => {
       }
       pendingConfirmation = latestPendingConfirmation;
     }
+
     if (pendingConfirmation.id !== currentConfirmation?.id) {
       const unconfirmedTransaction =
         unconfirmedTransactions[pendingConfirmation.id];
@@ -52,26 +62,27 @@ const useCurrentConfirmation = () => {
         setCurrentConfirmation(undefined);
         return;
       }
-      if (
-        pendingConfirmation.type !== ApprovalType.PersonalSign &&
-        pendingConfirmation.type !== ApprovalType.EthSignTypedData
-      ) {
+
+      const isConfirmationRedesignType =
+        REDESIGN_APPROVAL_TYPES.find(
+          (type) => type === pendingConfirmation?.type,
+        ) ||
+        REDESIGN_TRANSACTION_TYPES.find(
+          (type) => type === unconfirmedTransaction?.type,
+        );
+
+      if (!isConfirmationRedesignType) {
+        setCurrentConfirmation(undefined);
         return;
       }
-      if (pendingConfirmation.type === ApprovalType.PersonalSign) {
+
+      if (pendingConfirmation?.type === ApprovalType.PersonalSign) {
         const { siwe } = unconfirmedTransaction.msgParams;
         if (siwe?.isSIWEMessage) {
           setCurrentConfirmation(undefined);
           return;
         }
       }
-      if (pendingConfirmation.type === ApprovalType.EthSignTypedData) {
-        const { version } = unconfirmedTransaction.msgParams;
-        if (version !== 'V3' && version !== 'V4') {
-          setCurrentConfirmation(undefined);
-          return;
-        }
-      }
       setCurrentConfirmation(unconfirmedTransaction);
     }
   }, [latestPendingConfirmation, paramsTransactionId, unconfirmedTransactions]);
diff --git a/ui/pages/confirmations/hooks/useLedgerConnection.ts b/ui/pages/confirmations/hooks/useLedgerConnection.ts
new file mode 100644
index 000000000000..c9bd26fef3c8
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useLedgerConnection.ts
@@ -0,0 +1,120 @@
+import { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  HardwareTransportStates,
+  LEDGER_USB_VENDOR_ID,
+  LedgerTransportTypes,
+  WebHIDConnectedStatuses,
+} from '../../../../shared/constants/hardware-wallets';
+import {
+  getLedgerTransportStatus,
+  getLedgerWebHidConnectedStatus,
+  setLedgerTransportStatus,
+  setLedgerWebHidConnectedStatus,
+} from '../../../ducks/app/app';
+import {
+  getLedgerTransportType,
+  isAddressLedger,
+} from '../../../ducks/metamask/metamask';
+import { attemptLedgerTransportCreation } from '../../../store/actions';
+import { currentConfirmationSelector } from '../selectors';
+import { SignatureRequestType } from '../types/confirm';
+
+const useLedgerConnection = () => {
+  const dispatch = useDispatch();
+  const currentConfirmation = useSelector(
+    currentConfirmationSelector,
+  ) as SignatureRequestType;
+  const ledgerTransportType = useSelector(getLedgerTransportType);
+  const transportStatus = useSelector(getLedgerTransportStatus);
+  const webHidConnectedStatus = useSelector(getLedgerWebHidConnectedStatus);
+
+  let from: string | undefined;
+  // todo: extend to other confirmation types
+  if (currentConfirmation?.msgParams) {
+    from = currentConfirmation.msgParams.from;
+  }
+
+  const isLedgerWallet = useSelector(
+    (state) => from && isAddressLedger(state, from),
+  );
+
+  useEffect(() => {
+    if (!isLedgerWallet) {
+      return;
+    }
+    const initialConnectedDeviceCheck = async () => {
+      if (
+        ledgerTransportType === LedgerTransportTypes.webhid &&
+        webHidConnectedStatus !== WebHIDConnectedStatuses.connected
+      ) {
+        const devices = await window.navigator?.hid?.getDevices();
+        const webHidIsConnected = devices?.some(
+          (device) => device.vendorId === Number(LEDGER_USB_VENDOR_ID),
+        );
+        dispatch(
+          setLedgerWebHidConnectedStatus(
+            webHidIsConnected
+              ? WebHIDConnectedStatuses.connected
+              : WebHIDConnectedStatuses.notConnected,
+          ),
+        );
+      }
+    };
+    const determineTransportStatus = async () => {
+      if (
+        ledgerTransportType === LedgerTransportTypes.webhid &&
+        webHidConnectedStatus === WebHIDConnectedStatuses.connected &&
+        transportStatus === HardwareTransportStates.none
+      ) {
+        try {
+          const transportedCreated = await attemptLedgerTransportCreation();
+          dispatch(
+            setLedgerTransportStatus(
+              transportedCreated
+                ? HardwareTransportStates.verified
+                : HardwareTransportStates.unknownFailure,
+            ),
+          );
+        } catch (e: unknown) {
+          if ((e as Error).message.match('Failed to open the device')) {
+            dispatch(
+              setLedgerTransportStatus(
+                HardwareTransportStates.deviceOpenFailure,
+              ),
+            );
+          } else if ((e as Error).message.match('the device is already open')) {
+            dispatch(
+              setLedgerTransportStatus(HardwareTransportStates.verified),
+            );
+          } else {
+            dispatch(
+              setLedgerTransportStatus(HardwareTransportStates.unknownFailure),
+            );
+          }
+        }
+      }
+    };
+    determineTransportStatus();
+    initialConnectedDeviceCheck();
+  }, [
+    dispatch,
+    ledgerTransportType,
+    isLedgerWallet,
+    webHidConnectedStatus,
+    transportStatus,
+  ]);
+
+  useEffect(() => {
+    if (!isLedgerWallet) {
+      return undefined;
+    }
+    return () => {
+      dispatch(setLedgerTransportStatus(HardwareTransportStates.none));
+    };
+  }, [dispatch]);
+
+  return { isLedgerWallet };
+};
+
+export default useLedgerConnection;
diff --git a/ui/pages/confirmations/hooks/useSignatureSecurityAlertResponse.ts b/ui/pages/confirmations/hooks/useSignatureSecurityAlertResponse.ts
new file mode 100644
index 000000000000..03692a76d14c
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useSignatureSecurityAlertResponse.ts
@@ -0,0 +1,26 @@
+import { useSelector } from 'react-redux';
+import { SecurityAlertResponse } from '../types/confirm';
+
+type SignatureSecurityAlertResponsesState = {
+  metamask: {
+    signatureSecurityAlertResponses: Record<string, SecurityAlertResponse>;
+  };
+};
+
+/**
+ * @param securityAlertId
+ * @deprecated This file should be deprecated when we introduce the alerts system logic
+ * @see {@link https://github.com/MetaMask/MetaMask-planning/issues/2412}
+ */
+function useSignatureSecurityAlertResponse(securityAlertId?: string) {
+  const signatureSecurityAlertResponses = useSelector(
+    (state: SignatureSecurityAlertResponsesState) =>
+      state.metamask.signatureSecurityAlertResponses,
+  );
+
+  return securityAlertId
+    ? signatureSecurityAlertResponses?.[securityAlertId]
+    : null;
+}
+
+export default useSignatureSecurityAlertResponse;
diff --git a/ui/pages/confirmations/hooks/useTransactionInfo.js b/ui/pages/confirmations/hooks/useTransactionInfo.js
index c4fd4d90e2b1..452e44c83dfb 100644
--- a/ui/pages/confirmations/hooks/useTransactionInfo.js
+++ b/ui/pages/confirmations/hooks/useTransactionInfo.js
@@ -2,17 +2,19 @@ import { useSelector } from 'react-redux';
 import { getProviderConfig } from '../../../ducks/metamask/metamask';
 
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
+import { getSelectedInternalAccount } from '../../../selectors';
 
 export const useTransactionInfo = (txData = {}) => {
-  const { allNftContracts, selectedAddress } = useSelector(
-    (state) => state.metamask,
-  );
+  const { allNftContracts } = useSelector((state) => state.metamask);
+  const selectedInternalAccount = useSelector(getSelectedInternalAccount);
   const { chainId } = useSelector(getProviderConfig);
 
   const isNftTransfer = Boolean(
-    allNftContracts?.[selectedAddress]?.[chainId]?.find((contract) => {
-      return isEqualCaseInsensitive(contract.address, txData.txParams.to);
-    }),
+    allNftContracts?.[selectedInternalAccount.address]?.[chainId]?.find(
+      (contract) => {
+        return isEqualCaseInsensitive(contract.address, txData.txParams.to);
+      },
+    ),
   );
 
   return { isNftTransfer };
diff --git a/ui/pages/confirmations/hooks/useTransactionInfo.test.js b/ui/pages/confirmations/hooks/useTransactionInfo.test.js
index 101630bb25d7..a871c1a26716 100644
--- a/ui/pages/confirmations/hooks/useTransactionInfo.test.js
+++ b/ui/pages/confirmations/hooks/useTransactionInfo.test.js
@@ -1,7 +1,11 @@
 import { renderHookWithProvider } from '../../../../test/lib/render-helpers';
 import mockState from '../../../../test/data/mock-state.json';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import { useTransactionInfo } from './useTransactionInfo';
 
+const mockSelectedInternalAccount =
+  getSelectedInternalAccountFromMockState(mockState);
+
 describe('useTransactionInfo', () => {
   describe('isNftTransfer', () => {
     it('should return false if transaction is not NFT transfer', () => {
@@ -16,7 +20,7 @@ describe('useTransactionInfo', () => {
     });
     it('should return true if transaction is NFT transfer', () => {
       mockState.metamask.allNftContracts = {
-        [mockState.metamask.selectedAddress]: {
+        [mockSelectedInternalAccount.address]: {
           [mockState.metamask.providerConfig.chainId]: [{ address: '0x9' }],
         },
       };
diff --git a/ui/pages/confirmations/index.scss b/ui/pages/confirmations/index.scss
index 41a8291b712a..3efbea025238 100644
--- a/ui/pages/confirmations/index.scss
+++ b/ui/pages/confirmations/index.scss
@@ -1,5 +1,6 @@
 /** Please import your files in alphabetical order **/
 @import 'confirm-approve/index';
+@import 'confirm/index';
 @import 'confirmation/confirmation';
 @import 'send/gas-display/index';
 @import 'send/send';
diff --git a/ui/pages/confirmations/send/send-content/send-asset-row/send-asset-row.test.js b/ui/pages/confirmations/send/send-content/send-asset-row/send-asset-row.test.js
index f95429bc200f..74db26f04ebe 100644
--- a/ui/pages/confirmations/send/send-content/send-asset-row/send-asset-row.test.js
+++ b/ui/pages/confirmations/send/send-content/send-asset-row/send-asset-row.test.js
@@ -9,7 +9,6 @@ const mockStore = configureMockStore()(mockSendState);
 
 const props = {
   tokens: [],
-  selectedAddress: '0x0',
   nfts: [],
   collections: [],
   sendAsset: {
diff --git a/ui/pages/confirmations/send/send-content/send-content.component.js b/ui/pages/confirmations/send/send-content/send-content.component.js
index bbf70d28071d..97340b404db3 100644
--- a/ui/pages/confirmations/send/send-content/send-content.component.js
+++ b/ui/pages/confirmations/send/send-content/send-content.component.js
@@ -34,7 +34,7 @@ export default class SendContent extends Component {
     recipient: PropTypes.object,
     acknowledgeRecipientWarning: PropTypes.func,
     recipientWarningAcknowledged: PropTypes.bool,
-    isMultiLayerFeeNetwork: PropTypes.bool,
+    hasLayer1GasFee: PropTypes.bool,
   };
 
   render() {
@@ -49,7 +49,7 @@ export default class SendContent extends Component {
       assetError,
       recipient,
       recipientWarningAcknowledged,
-      isMultiLayerFeeNetwork,
+      hasLayer1GasFee,
     } = this.props;
 
     let gasError;
@@ -82,7 +82,7 @@ export default class SendContent extends Component {
           <SendAmountRow />
           {networkOrAccountNotSupports1559 ? <SendGasRow /> : null}
           {showHexData ? <SendHexDataRow /> : null}
-          {!isMultiLayerFeeNetwork && <GasDisplay gasError={gasError} />}
+          {!hasLayer1GasFee && <GasDisplay gasError={gasError} />}
         </div>
       </PageContainerContent>
     );
diff --git a/ui/pages/confirmations/send/send-content/send-content.container.js b/ui/pages/confirmations/send/send-content/send-content.container.js
index f944e1677e4c..72d25deb333b 100644
--- a/ui/pages/confirmations/send/send-content/send-content.container.js
+++ b/ui/pages/confirmations/send/send-content/send-content.container.js
@@ -3,7 +3,6 @@ import {
   getIsEthGasPriceFetched,
   getNoGasPriceFetched,
   checkNetworkOrAccountNotSupports1559,
-  getIsMultiLayerFeeNetwork,
 } from '../../../../selectors';
 import {
   getIsBalanceInsufficient,
@@ -12,6 +11,7 @@ import {
   getRecipient,
   acknowledgeRecipientWarning,
   getRecipientWarningAcknowledgement,
+  hasSendLayer1GasFee,
 } from '../../../../ducks/send';
 import SendContent from './send-content.component';
 
@@ -30,7 +30,7 @@ function mapStateToProps(state) {
     assetError: getAssetError(state),
     recipient,
     recipientWarningAcknowledged,
-    isMultiLayerFeeNetwork: getIsMultiLayerFeeNetwork(state),
+    hasLayer1GasFee: hasSendLayer1GasFee(state),
   };
 }
 
diff --git a/ui/pages/confirmations/send/send.test.js b/ui/pages/confirmations/send/send.test.js
index a2ae0d7000f2..f8b17cfb627f 100644
--- a/ui/pages/confirmations/send/send.test.js
+++ b/ui/pages/confirmations/send/send.test.js
@@ -81,7 +81,6 @@ const baseStore = {
       medium: '1',
       fast: '2',
     },
-    selectedAddress: '0x0',
     internalAccounts: {
       accounts: {
         'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -134,7 +133,6 @@ const baseStore = {
     accounts: {
       '0x0': { balance: '0x0', address: '0x0' },
     },
-    identities: { '0x0': { address: '0x0' } },
     tokenAddress: '0x32e6c34cd57087abbd59b5a4aecc4cb495924356',
     tokenList: {
       '0x32e6c34cd57087abbd59b5a4aecc4cb495924356': {
diff --git a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
index f7dcf1f01ed2..ca5141f6f873 100644
--- a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
+++ b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
@@ -149,6 +149,7 @@ exports[`TokenAllowancePage when mounted should match snapshot 1`] = `
           </div>
           <div
             class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+            style="height: 16px; width: 16px;"
           >
             <span
               class="icon-with-fallback__fallback"
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.js b/ui/pages/confirmations/token-allowance/token-allowance.js
index 98530b0df6ba..e8d6bbf5bbbe 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.js
@@ -14,7 +14,6 @@ import {
   FLEX_DIRECTION,
   FontWeight,
   JustifyContent,
-  Severity,
   TextAlign,
   TextColor,
   TextVariant,
@@ -37,9 +36,6 @@ import {
   getTargetAccountWithSendEtherInfo,
   getCustomNonceValue,
   getNextSuggestedNonce,
-  getHasMigratedFromOpenSeaToBlockaid,
-  getIsNetworkSupportedByBlockaid,
-  getHasDismissedOpenSeaToBlockaidBanner,
 } from '../../../selectors';
 import { NETWORK_TO_NAME_MAP } from '../../../../shared/constants/network';
 import {
@@ -49,7 +45,6 @@ import {
   updateAndApproveTx,
   getNextNonce,
   updateCustomNonce,
-  dismissOpenSeaToBlockaidBanner,
 } from '../../../store/actions';
 import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
@@ -66,26 +61,20 @@ import {
   NUM_W_OPT_DECIMAL_COMMA_OR_DOT_REGEX,
 } from '../../../../shared/constants/tokens';
 import { isSuspiciousResponse } from '../../../../shared/modules/security-provider.utils';
-
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 import BlockaidBannerAlert from '../components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
 ///: END:ONLY_INCLUDE_IF
-
 import { ConfirmPageContainerNavigation } from '../components/confirm-page-container';
 import { useSimulationFailureWarning } from '../hooks/useSimulationFailureWarning';
 import SimulationErrorMessage from '../components/simulation-error-message';
 import LedgerInstructionField from '../components/ledger-instruction-field/ledger-instruction-field';
 import SecurityProviderBannerMessage from '../components/security-provider-banner-message/security-provider-banner-message';
-import {
-  BannerAlert,
-  Icon,
-  IconName,
-  Text,
-} from '../../../components/component-library';
+import { Icon, IconName, Text } from '../../../components/component-library';
 import { ConfirmPageContainerWarning } from '../components/confirm-page-container/confirm-page-container-content';
 import CustomNonce from '../components/custom-nonce';
 import FeeDetailsComponent from '../components/fee-details-component/fee-details-component';
 import { BlockaidResultType } from '../../../../shared/constants/security-provider';
+import { BlockaidUnavailableBannerAlert } from '../components/blockaid-unavailable-banner-alert/blockaid-unavailable-banner-alert';
 
 const ALLOWED_HOSTS = ['portfolio.metamask.io'];
 
@@ -101,7 +90,6 @@ export default function TokenAllowance({
   hexTransactionTotal,
   hexMinimumTransactionFee,
   txData,
-  isMultiLayerFeeNetwork,
   supportsEIP1559,
   userAddress,
   tokenAddress,
@@ -347,24 +335,6 @@ export default function TokenAllowance({
       ? 'danger-primary'
       : 'primary';
 
-  const hasMigratedFromOpenSeaToBlockaid = useSelector(
-    getHasMigratedFromOpenSeaToBlockaid,
-  );
-  const isNetworkSupportedByBlockaid = useSelector(
-    getIsNetworkSupportedByBlockaid,
-  );
-  const hasDismissedOpenSeaToBlockaidBanner = useSelector(
-    getHasDismissedOpenSeaToBlockaidBanner,
-  );
-
-  const showOpenSeaToBlockaidBannerAlert =
-    hasMigratedFromOpenSeaToBlockaid &&
-    !isNetworkSupportedByBlockaid &&
-    !hasDismissedOpenSeaToBlockaidBanner;
-
-  const handleCloseOpenSeaToBlockaidBannerAlert = () => {
-    dispatch(dismissOpenSeaToBlockaidBanner());
-  };
   return (
     <Box className="token-allowance-container page-container">
       <Box>
@@ -413,26 +383,15 @@ export default function TokenAllowance({
       />
       {
         ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-        <BlockaidBannerAlert txData={txData} margin={4} />
-        ///: END:ONLY_INCLUDE_IF
-      }
-      {showOpenSeaToBlockaidBannerAlert ? (
-        <BannerAlert
-          severity={Severity.Info}
-          title={t('openSeaToBlockaidTitle')}
-          description={t('openSeaToBlockaidDescription')}
-          actionButtonLabel={t('openSeaToBlockaidBtnLabel')}
-          actionButtonProps={{
-            href: 'https://snaps.metamask.io/transaction-insights',
-            externalLink: true,
-          }}
-          marginBottom={4}
-          marginLeft={4}
+        <BlockaidBannerAlert
+          txData={txData}
           marginTop={4}
+          marginLeft={4}
           marginRight={4}
-          onClose={handleCloseOpenSeaToBlockaidBannerAlert}
         />
-      ) : null}
+        ///: END:ONLY_INCLUDE_IF
+      }
+      <BlockaidUnavailableBannerAlert />
       {isSuspiciousResponse(txData?.securityProviderResponse) && (
         <SecurityProviderBannerMessage
           securityProviderResponse={txData.securityProviderResponse}
@@ -571,7 +530,6 @@ export default function TokenAllowance({
             renderTransactionDetailsContent
             noBorder={useNonceField || !showFullTxDetails}
             supportsEIP1559={supportsEIP1559}
-            isMultiLayerFeeNetwork={isMultiLayerFeeNetwork}
             ethTransactionTotal={ethTransactionTotal}
             nativeCurrency={nativeCurrency}
             fullTxData={fullTxData}
@@ -746,10 +704,6 @@ TokenAllowance.propTypes = {
    * Current transaction
    */
   txData: PropTypes.object,
-  /**
-   * Is multi-layer fee network or not
-   */
-  isMultiLayerFeeNetwork: PropTypes.bool,
   /**
    * Is the enhanced gas fee enabled or not
    */
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.stories-to-do.js b/ui/pages/confirmations/token-allowance/token-allowance.stories-to-do.js
index fa9b52724817..9c08a176b4d4 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.stories-to-do.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.stories-to-do.js
@@ -33,9 +33,6 @@ export default {
     hexTransactionTotal: {
       control: 'text',
     },
-    isMultiLayerFeeNetwork: {
-      control: 'text',
-    },
     supportsEIP1559: {
       control: 'boolean',
     },
@@ -82,7 +79,6 @@ export default {
     ethTransactionTotal: '0.0012',
     fiatTransactionTotal: '1.6',
     hexTransactionTotal: '0x44364c5bb0000',
-    isMultiLayerFeeNetwork: false,
     supportsEIP1559: false,
     userAddress: '0xdd34b35ca1de17dfcdc07f79ff1f8f94868c40a1',
     tokenAddress: '0x55797717b9947b31306f4aac7ad1365c6e3923bd',
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.stories.js b/ui/pages/confirmations/token-allowance/token-allowance.stories.js
index 57b984cd122d..ed6078bf2a87 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.stories.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.stories.js
@@ -19,7 +19,6 @@ const defaultArgs = {
   ethTransactionTotal: '0.0012',
   fiatTransactionTotal: '1.6',
   hexTransactionTotal: '0x44364c5bb0000',
-  isMultiLayerFeeNetwork: false,
   supportsEIP1559: false,
   userAddress: '0x9d0ba4ddac06032527b140912ec808ab9451b788',
   tokenAddress: '0x55797717b9947b31306f4aac7ad1365c6e3923bd',
@@ -161,9 +160,6 @@ export default {
     hexTransactionTotal: {
       control: 'text',
     },
-    isMultiLayerFeeNetwork: {
-      control: 'boolean',
-    },
     supportsEIP1559: {
       control: 'boolean',
     },
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.test.js b/ui/pages/confirmations/token-allowance/token-allowance.test.js
index 359c1d88aab3..37e8a58b5e5c 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.test.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.test.js
@@ -22,17 +22,6 @@ const state = {
       },
     },
     gasEstimateType: 'none',
-    selectedAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-    identities: {
-      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
-        address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-        name: 'Account 1',
-      },
-      '0xc42edfcc21ed14dda456aa0756c153f7985d8813': {
-        address: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
-        name: 'Account 2',
-      },
-    },
     internalAccounts: {
       accounts: {
         'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -190,7 +179,6 @@ describe('TokenAllowancePage', () => {
     ethTransactionTotal: '0.0012',
     fiatTransactionTotal: '1.6',
     hexTransactionTotal: '0x44364c5bb0000',
-    isMultiLayerFeeNetwork: false,
     supportsEIP1559: true,
     userAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
     tokenAddress: '0x55797717b9947b31306f4aac7ad1365c6e3923bd',
@@ -534,7 +522,6 @@ describe('TokenAllowancePage', () => {
       ...state,
       metamask: {
         ...state.metamask,
-        selectedAddress: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
       },
     };
     const newStore = configureMockStore([thunk])(newState);
diff --git a/ui/pages/confirmations/types/confirm.ts b/ui/pages/confirmations/types/confirm.ts
index 08baf047d188..73a4e5b58fd7 100644
--- a/ui/pages/confirmations/types/confirm.ts
+++ b/ui/pages/confirmations/types/confirm.ts
@@ -1,5 +1,14 @@
 import { ApprovalControllerState } from '@metamask/approval-controller';
-import { TransactionType } from '@metamask/transaction-controller';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
+
+export type TypedSignDataV1Type = {
+  name: string;
+  value: string;
+  type: string;
+}[];
 
 export type SecurityAlertResponse = {
   reason: string;
@@ -15,14 +24,15 @@ export type SignatureRequestType = {
   msgParams?: {
     from: string;
     origin: string;
-    data: string;
+    data: string | TypedSignDataV1Type;
+    version?: string;
   };
   type: TransactionType;
   custodyId?: string;
   securityAlertResponse?: SecurityAlertResponse;
 };
 
-export type Confirmation = SignatureRequestType;
+export type Confirmation = SignatureRequestType | TransactionMeta;
 
 export type ConfirmMetamaskState = {
   confirm: {
diff --git a/ui/pages/confirmations/utils/confirm.test.ts b/ui/pages/confirmations/utils/confirm.test.ts
index 7a94e2d063e0..235a82d4e0ad 100644
--- a/ui/pages/confirmations/utils/confirm.test.ts
+++ b/ui/pages/confirmations/utils/confirm.test.ts
@@ -8,12 +8,16 @@ describe('confirm util', () => {
     it('returns true for signature approval requests', () => {
       const result = isSignatureApprovalRequest({
         type: ApprovalType.PersonalSign,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as ApprovalRequest<any>);
       expect(result).toStrictEqual(true);
     });
     it('returns false for request not of type signature', () => {
       const result = isSignatureApprovalRequest({
         type: ApprovalType.Transaction,
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as ApprovalRequest<any>);
       expect(result).toStrictEqual(false);
     });
diff --git a/ui/pages/confirmations/utils/confirm.ts b/ui/pages/confirmations/utils/confirm.ts
index 8f09c54460a1..4e2a49678f1a 100644
--- a/ui/pages/confirmations/utils/confirm.ts
+++ b/ui/pages/confirmations/utils/confirm.ts
@@ -1,8 +1,20 @@
 import { ApprovalRequest } from '@metamask/approval-controller';
 import { ApprovalType } from '@metamask/controller-utils';
+import { TransactionType } from '@metamask/transaction-controller';
 import { Json } from '@metamask/utils';
 
-const SignatureApprovalTypes = [
+export const REDESIGN_APPROVAL_TYPES = [
+  ApprovalType.EthSignTypedData,
+  ApprovalType.PersonalSign,
+] as const;
+
+export const REDESIGN_TRANSACTION_TYPES = [
+  ...(process.env.ENABLE_CONFIRMATION_REDESIGN
+    ? [TransactionType.contractInteraction]
+    : []),
+] as const;
+
+const SIGNATURE_APPROVAL_TYPES = [
   ApprovalType.EthSign,
   ApprovalType.PersonalSign,
   ApprovalType.EthSignTypedData,
@@ -10,4 +22,4 @@ const SignatureApprovalTypes = [
 
 export const isSignatureApprovalRequest = (
   request: ApprovalRequest<Record<string, Json>>,
-) => SignatureApprovalTypes.includes(request.type as ApprovalType);
+) => SIGNATURE_APPROVAL_TYPES.includes(request.type as ApprovalType);
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 094802c7d223..fe518ed0aa62 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -15,6 +15,7 @@ import TermsOfUsePopup from '../../components/app/terms-of-use-popup';
 import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminder';
 import WhatsNewPopup from '../../components/app/whats-new-popup';
 import { FirstTimeFlowType } from '../../../shared/constants/onboarding';
+import SmartTransactionsOptInModal from '../../components/app/smart-transactions/smart-transactions-opt-in-modal';
 ///: END:ONLY_INCLUDE_IF
 import HomeNotification from '../../components/app/home-notification';
 import MultipleNotifications from '../../components/app/multiple-notifications';
@@ -40,6 +41,7 @@ import {
   ///: END:ONLY_INCLUDE_IF
   IconColor,
   BackgroundColor,
+  Severity,
 } from '../../helpers/constants/design-system';
 import { SECOND } from '../../../shared/constants/time';
 import {
@@ -53,6 +55,7 @@ import {
   Text,
   BannerBase,
   Icon,
+  BannerAlert,
 } from '../../components/component-library';
 
 import {
@@ -152,6 +155,7 @@ export default class Home extends PureComponent {
     hideWhatsNewPopup: PropTypes.func.isRequired,
     announcementsToShow: PropTypes.bool.isRequired,
     onboardedInThisUISession: PropTypes.bool,
+    isSmartTransactionsOptInModalAvailable: PropTypes.bool.isRequired,
     ///: END:ONLY_INCLUDE_IF
     newNetworkAddedConfigurationId: PropTypes.string,
     isNotification: PropTypes.bool.isRequired,
@@ -195,6 +199,8 @@ export default class Home extends PureComponent {
     setSurveyLinkLastClickedOrClosed: PropTypes.func.isRequired,
     showSurveyToast: PropTypes.bool.isRequired,
     hasAllowedPopupRedirectApprovals: PropTypes.bool.isRequired,
+    useExternalServices: PropTypes.bool,
+    setBasicFunctionalityModalOpen: PropTypes.func,
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     institutionalConnectRequests: PropTypes.arrayOf(PropTypes.object),
     mmiPortfolioEnabled: PropTypes.bool,
@@ -507,7 +513,7 @@ export default class Home extends PureComponent {
         ) : null}
         {removeNftMessage === 'success' ? (
           <ActionableMessage
-            type="danger"
+            type="success"
             className="home__new-network-notification"
             autoHideTime={autoHideDelay}
             onAutoHide={onAutoHide}
@@ -527,6 +533,28 @@ export default class Home extends PureComponent {
             }
           />
         ) : null}
+        {removeNftMessage === 'error' ? (
+          <ActionableMessage
+            type="danger"
+            className="home__new-network-notification"
+            autoHideTime={autoHideDelay}
+            onAutoHide={onAutoHide}
+            message={
+              <Box display={Display.InlineFlex}>
+                <i className="fa fa-check-circle home__new-nft-notification-icon" />
+                <Text variant={TextVariant.bodySm} as="h6">
+                  {t('removeNftErrorMessage')}
+                </Text>
+                <ButtonIcon
+                  iconName={IconName.Close}
+                  size={ButtonIconSize.Sm}
+                  ariaLabel={t('close')}
+                  onClick={onAutoHide}
+                />
+              </Box>
+            }
+          />
+        ) : null}
         {newNetworkAddedName ? (
           <ActionableMessage
             type="success"
@@ -783,6 +811,8 @@ export default class Home extends PureComponent {
     const {
       defaultHomeActiveTabName,
       onTabClick,
+      useExternalServices,
+      setBasicFunctionalityModalOpen,
       forgottenPassword,
       history,
       setSurveyLinkLastClickedOrClosed,
@@ -800,6 +830,7 @@ export default class Home extends PureComponent {
       announcementsToShow,
       firstTimeFlowType,
       newNetworkAddedConfigurationId,
+      isSmartTransactionsOptInModalAvailable,
       ///: END:ONLY_INCLUDE_IF
       ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
       mmiPortfolioEnabled,
@@ -811,18 +842,25 @@ export default class Home extends PureComponent {
     } else if (this.state.notificationClosing || this.state.redirecting) {
       return null;
     }
-    const tabPadding = process.env.MULTICHAIN ? 4 : 0; // TODO: Remove tabPadding and add paddingTop={4} to parent container Box of Tabs
+    const tabPadding = 4;
 
     ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-    const showWhatsNew =
+    const canSeeModals =
       completedOnboarding &&
       (!onboardedInThisUISession ||
         firstTimeFlowType === FirstTimeFlowType.import) &&
-      announcementsToShow &&
-      showWhatsNewPopup &&
       !process.env.IN_TEST &&
       !newNetworkAddedConfigurationId;
 
+    const showSmartTransactionsOptInModal =
+      canSeeModals && isSmartTransactionsOptInModalAvailable;
+
+    const showWhatsNew =
+      canSeeModals &&
+      announcementsToShow &&
+      showWhatsNewPopup &&
+      !showSmartTransactionsOptInModal;
+
     const showTermsOfUse =
       completedOnboarding && !onboardedInThisUISession && showTermsOfUsePopup;
     ///: END:ONLY_INCLUDE_IF
@@ -856,6 +894,10 @@ export default class Home extends PureComponent {
           {
             ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
           }
+          <SmartTransactionsOptInModal
+            isOpen={showSmartTransactionsOptInModal}
+            hideWhatsNewPopup={hideWhatsNewPopup}
+          />
           {showWhatsNew ? <WhatsNewPopup onClose={hideWhatsNewPopup} /> : null}
           {!showWhatsNew && showRecoveryPhraseReminder ? (
             <RecoveryPhraseReminder
@@ -873,6 +915,18 @@ export default class Home extends PureComponent {
             ///: END:ONLY_INCLUDE_IF
           }
           <div className="home__main-view">
+            {useExternalServices ? null : (
+              <BannerAlert
+                margin={4}
+                marginBottom={0}
+                severity={Severity.Danger}
+                actionButtonLabel={t('basicConfigurationBannerCTA')}
+                actionButtonOnClick={() => {
+                  setBasicFunctionalityModalOpen();
+                }}
+                title={t('basicConfigurationBannerTitle')}
+              ></BannerAlert>
+            )}
             <div className="home__balance-wrapper">
               {
                 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 3149cb5b6ada..f942905c113c 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -18,6 +18,7 @@ import { getInstitutionalConnectRequests } from '../../ducks/institutional/insti
 ///: END:ONLY_INCLUDE_IF
 import {
   activeTabHasPermissions,
+  getUseExternalServices,
   getFirstPermissionRequest,
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   getFirstSnapInstallOrUpdateRequest,
@@ -45,10 +46,12 @@ import {
   getShowSurveyToast,
   getNewTokensImportedError,
   hasPendingApprovals,
+  getSelectedInternalAccount,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   getAccountType,
   ///: END:ONLY_INCLUDE_IF
 } from '../../selectors';
+import { getIsSmartTransactionsOptInModalAvailable } from '../../../shared/modules/selectors';
 
 import {
   closeNotificationPopup,
@@ -67,8 +70,12 @@ import {
   setActiveNetwork,
   setSurveyLinkLastClickedOrClosed,
   setNewTokensImportedError,
+  toggleExternalServices,
 } from '../../store/actions';
-import { hideWhatsNewPopup } from '../../ducks/app/app';
+import {
+  hideWhatsNewPopup,
+  openBasicFunctionalityModal,
+} from '../../ducks/app/app';
 import { getWeb3ShimUsageAlertEnabledness } from '../../ducks/metamask/metamask';
 import { getSwapsFeatureIsLive } from '../../ducks/swaps/swaps';
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
@@ -91,13 +98,13 @@ const mapStateToProps = (state) => {
   const { metamask, appState } = state;
   const {
     seedPhraseBackedUp,
-    selectedAddress,
     connectedStatusPopoverHasBeenShown,
     defaultHomeActiveTabName,
     swapsState,
     firstTimeFlowType,
     completedOnboarding,
   } = metamask;
+  const { address: selectedAddress } = getSelectedInternalAccount(state);
   const { forgottenPassword } = metamask;
   const totalUnapprovedCount = getTotalUnapprovedCount(state);
   const swapsEnabled = getSwapsFeatureIsLive(state);
@@ -142,6 +149,8 @@ const mapStateToProps = (state) => {
   ]);
 
   return {
+    useExternalServices: getUseExternalServices(state),
+    isBasicConfigurationModalOpen: appState.showBasicFunctionalityModal,
     forgottenPassword,
     hasWatchTokenPendingApprovals,
     hasWatchNftPendingApprovals,
@@ -193,6 +202,8 @@ const mapStateToProps = (state) => {
     custodianDeepLink: getCustodianDeepLink(state),
     accountType: getAccountType(state),
     ///: END:ONLY_INCLUDE_IF
+    isSmartTransactionsOptInModalAvailable:
+      getIsSmartTransactionsOptInModalAvailable(state),
   };
 };
 
@@ -271,6 +282,9 @@ const mapDispatchToProps = (dispatch) => {
     ///: END:ONLY_INCLUDE_IF
     setSurveyLinkLastClickedOrClosed: (time) =>
       dispatch(setSurveyLinkLastClickedOrClosed(time)),
+    toggleExternalServices: (value) => dispatch(toggleExternalServices(value)),
+    setBasicFunctionalityModalOpen: () =>
+      dispatch(openBasicFunctionalityModal()),
   };
 };
 
diff --git a/ui/pages/home/index.scss b/ui/pages/home/index.scss
index c8650859622c..2c40f4cf78c5 100644
--- a/ui/pages/home/index.scss
+++ b/ui/pages/home/index.scss
@@ -200,8 +200,7 @@
     }
 
     &-icon {
-      @include design-system.H3;
-
+      font-size: 24px;
       margin-inline-end: 12px;
       color: var(--color-success-default);
     }
diff --git a/ui/pages/index.js b/ui/pages/index.js
index b2535958daa3..11edbba4fe19 100644
--- a/ui/pages/index.js
+++ b/ui/pages/index.js
@@ -8,6 +8,7 @@ import {
   MetaMetricsProvider,
   LegacyMetaMetricsProvider,
 } from '../contexts/metametrics';
+import { CurrencyRateProvider } from '../contexts/currencyRate';
 import ErrorPage from './error';
 import Routes from './routes';
 
@@ -45,7 +46,9 @@ class Index extends PureComponent {
             <LegacyMetaMetricsProvider>
               <I18nProvider>
                 <LegacyI18nProvider>
-                  <Routes />
+                  <CurrencyRateProvider>
+                    <Routes />
+                  </CurrencyRateProvider>
                 </LegacyI18nProvider>
               </I18nProvider>
             </LegacyMetaMetricsProvider>
diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js
index a8b67c83f342..e9e70167896a 100644
--- a/ui/pages/institutional/custody/custody.js
+++ b/ui/pages/institutional/custody/custody.js
@@ -45,7 +45,10 @@ import {
   CUSTODY_ACCOUNT_ROUTE,
   DEFAULT_ROUTE,
 } from '../../../helpers/constants/routes';
-import { getCurrentChainId, getSelectedAddress } from '../../../selectors';
+import {
+  getCurrentChainId,
+  getSelectedInternalAccount,
+} from '../../../selectors';
 import { getMMIConfiguration } from '../../../selectors/institutional/selectors';
 import { getInstitutionalConnectRequests } from '../../../ducks/institutional/institutional';
 import CustodyAccountList from '../connect-custody/account-list';
@@ -57,9 +60,8 @@ import {
 import PulseLoader from '../../../components/ui/pulse-loader/pulse-loader';
 import ConfirmConnectCustodianModal from '../confirm-connect-custodian-modal';
 import { findCustodianByEnvName } from '../../../helpers/utils/institutional/find-by-custodian-name';
-import { setSelectedAddress } from '../../../store/actions';
-
-const GK8_DISPLAY_NAME = 'gk8';
+import { setSelectedInternalAccount } from '../../../store/actions';
+import QRCodeModal from '../../../components/institutional/qr-code-modal/qr-code-modal';
 
 const CustodyPage = () => {
   const t = useI18nContext();
@@ -90,12 +92,16 @@ const CustodyPage = () => {
   const [addNewTokenClicked, setAddNewTokenClicked] = useState(false);
   const [chainId, setChainId] = useState(parseInt(currentChainId, 16));
   const [accounts, setAccounts] = useState();
+  const [showQRCodeModal, setShowQRCodeModal] = useState(false);
+  const [qrConnectionRequest, setQrConnectionRequest] = useState(null);
   const [searchQuery, setSearchQuery] = useState('');
   const connectRequests = useSelector(getInstitutionalConnectRequests, isEqual);
-  const address = useSelector(getSelectedAddress);
+  const { address } = useSelector(getSelectedInternalAccount);
   const connectRequest = connectRequests ? connectRequests[0] : undefined;
   const isCheckBoxSelected =
     accounts && Object.keys(selectedAccounts).length === accounts.length;
+  const custodianURL =
+    matchedCustodian?.onboardingUrl || matchedCustodian?.website;
 
   let searchResults = accounts;
 
@@ -161,15 +167,13 @@ const CustodyPage = () => {
         setCurrentJwt(jwtListValue[0] || '');
         setJwtList(jwtListValue);
 
-        // open confirm Connect Custodian modal except for gk8
-        if (
-          custodianByDisplayName?.displayName?.toLocaleLowerCase() ===
-          GK8_DISPLAY_NAME
-        ) {
+        if (custodianByDisplayName.isManualTokenInputSupported) {
           setSelectedCustodianType(custodian.type);
         } else {
           setMatchedCustodian(custodianByDisplayName);
-          setIsConfirmConnectCustodianModalVisible(true);
+          custodianByDisplayName.isQRCodeSupported
+            ? setShowQRCodeModal(true)
+            : setIsConfirmConnectCustodianModalVisible(true);
         }
 
         trackEvent({
@@ -273,15 +277,27 @@ const CustodyPage = () => {
     [selectedCustodianName, trackEvent],
   );
 
-  useEffect(() => {
-    const fetchConnectRequest = async () => {
+  const removeConnectRequest = async () => {
+    if (connectRequest) {
+      await dispatch(
+        mmiActions.removeAddTokenConnectRequest({
+          origin: connectRequest.origin,
+          environment: connectRequest.environment,
+          token: connectRequest.token,
+        }),
+      );
+    }
+  };
+
+  const fetchConnectRequest = useCallback(
+    async (connectionRequest) => {
       try {
-        if (connectRequest && Object.keys(connectRequest).length) {
+        if (connectionRequest && Object.keys(connectionRequest).length) {
           const {
             token,
             environment: custodianName, // this is the env name
             service: custodianType,
-          } = connectRequest;
+          } = connectionRequest;
 
           const custodianToken =
             token || (await dispatch(mmiActions.getCustodianToken(address)));
@@ -290,6 +306,7 @@ const CustodyPage = () => {
           setSelectedCustodianType(custodianType);
           setSelectedCustodianName(custodianName || custodianType);
           setConnectError('');
+          setQrConnectionRequest(null);
 
           const accountsValue = await dispatch(
             mmiActions.getCustodianAccounts(
@@ -315,11 +332,21 @@ const CustodyPage = () => {
         console.error(error);
         handleConnectError(error);
       }
-    };
+    },
+    [
+      address,
+      connectRequest,
+      dispatch,
+      handleConnectError,
+      mmiActions,
+      trackEvent,
+    ],
+  );
 
+  useEffect(() => {
     const handleFetchConnectRequest = () => {
       setLoading(true);
-      fetchConnectRequest().finally(() => setLoading(false));
+      fetchConnectRequest(connectRequest).finally(() => setLoading(false));
     };
 
     handleFetchConnectRequest();
@@ -354,7 +381,15 @@ const CustodyPage = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentChainId]);
 
-  const cancelConnectCustodianToken = () => {
+  useEffect(() => {
+    if (qrConnectionRequest) {
+      setLoading(true);
+      fetchConnectRequest(qrConnectionRequest).finally(() => setLoading(false));
+    }
+  }, [fetchConnectRequest, qrConnectionRequest]);
+
+  const cancelConnectCustodianToken = async () => {
+    await removeConnectRequest();
     setSelectedCustodianName('');
     setSelectedCustodianType('');
     setSelectedCustodianImage(null);
@@ -539,6 +574,7 @@ const CustodyPage = () => {
                       );
 
                       setAccounts(accountsValue);
+                      await removeConnectRequest();
                       trackEvent({
                         category: MetaMetricsEventCategory.MMI,
                         event: MetaMetricsEventName.CustodianConnected,
@@ -594,7 +630,7 @@ const CustodyPage = () => {
               const selectedCustodian = custodians.find(
                 (custodian) => custodian.envName === selectedCustodianName,
               );
-              const firstAccountKey = Object.keys(selectedAccounts).shift();
+              const firstAccountId = Object.keys(selectedAccounts).shift();
 
               await dispatch(
                 mmiActions.connectCustodyAddresses(
@@ -604,7 +640,7 @@ const CustodyPage = () => {
                 ),
               );
 
-              dispatch(setSelectedAddress(firstAccountKey.toLowerCase()));
+              dispatch(setSelectedInternalAccount(firstAccountId));
 
               trackEvent({
                 category: MetaMetricsEventCategory.MMI,
@@ -616,6 +652,8 @@ const CustodyPage = () => {
                 },
               });
 
+              await removeConnectRequest();
+
               history.push({
                 pathname: CUSTODY_ACCOUNT_DONE_ROUTE,
                 state: {
@@ -631,7 +669,8 @@ const CustodyPage = () => {
               setSelectError(e.message);
             }
           }}
-          onCancel={() => {
+          onCancel={async () => {
+            await removeConnectRequest();
             setAccounts(null);
             setSelectedCustodianName(null);
             setSelectedCustodianType(null);
@@ -732,9 +771,18 @@ const CustodyPage = () => {
         <ConfirmConnectCustodianModal
           onModalClose={() => setIsConfirmConnectCustodianModalVisible(false)}
           custodianName={selectedCustodianDisplayName}
-          custodianURL={
-            matchedCustodian?.onboardingUrl || matchedCustodian?.website
-          }
+          custodianURL={custodianURL}
+        />
+      )}
+
+      {showQRCodeModal && (
+        <QRCodeModal
+          onClose={() => {
+            setShowQRCodeModal(false);
+          }}
+          custodianName={selectedCustodianDisplayName}
+          custodianURL={custodianURL}
+          setQrConnectionRequest={setQrConnectionRequest}
         />
       )}
     </Box>
diff --git a/ui/pages/institutional/custody/custody.test.js b/ui/pages/institutional/custody/custody.test.js
index fba78258273d..f58183a1ee0f 100644
--- a/ui/pages/institutional/custody/custody.test.js
+++ b/ui/pages/institutional/custody/custody.test.js
@@ -54,6 +54,8 @@ describe('CustodyPage', function () {
             production: true,
             refreshTokenUrl: null,
             isNoteToTraderSupported: false,
+            isManualTokenInputSupported: true,
+            isQRCodeSupported: false,
             version: 1,
             website: 'test website',
           },
@@ -67,6 +69,8 @@ describe('CustodyPage', function () {
             production: true,
             refreshTokenUrl: null,
             isNoteToTraderSupported: false,
+            isManualTokenInputSupported: false,
+            isQRCodeSupported: false,
             version: 1,
             website: 'test website',
           },
@@ -81,6 +85,71 @@ describe('CustodyPage', function () {
       history: {
         mostRecentOverviewPage: '/',
       },
+      internalAccounts: {
+        accounts: {
+          '694225f4-d30b-4e77-a900-c8bbce735b42': {
+            address: '0xca8f1F0245530118D0cf14a06b01Daf8f76Cf281',
+            id: '694225f4-d30b-4e77-a900-c8bbce735b42',
+            metadata: {
+              name: 'Custody 1',
+              keyring: {
+                type: 'Custody test',
+              },
+            },
+            options: {},
+            methods: [
+              'personal_sign',
+              'eth_sign',
+              'eth_signTransaction',
+              'eth_signTypedData_v1',
+              'eth_signTypedData_v3',
+              'eth_signTypedData_v4',
+            ],
+            type: 'eip155:eoa',
+          },
+          '2d4193b2-e10d-412c-ae33-c0b689e6ddd8': {
+            address: '0xca8f1F0245530118D0cf14a06b01Daf8f76Cf281',
+            id: '2d4193b2-e10d-412c-ae33-c0b689e6ddd8',
+            metadata: {
+              name: 'Custody 2',
+              keyring: {
+                type: 'Custody test',
+              },
+            },
+            options: {},
+            methods: [
+              'personal_sign',
+              'eth_sign',
+              'eth_signTransaction',
+              'eth_signTypedData_v1',
+              'eth_signTypedData_v3',
+              'eth_signTypedData_v4',
+            ],
+            type: 'eip155:eoa',
+          },
+          '434621b7-23e6-4568-962d-b576a5e2ec43': {
+            address: '0xca8f1F0245530118D0cf14a06b01Daf8f76Cf281',
+            id: '434621b7-23e6-4568-962d-b576a5e2ec43',
+            metadata: {
+              name: 'Custody 3',
+              keyring: {
+                type: 'Custody test',
+              },
+            },
+            options: {},
+            methods: [
+              'personal_sign',
+              'eth_sign',
+              'eth_signTransaction',
+              'eth_signTypedData_v1',
+              'eth_signTypedData_v3',
+              'eth_signTypedData_v4',
+            ],
+            type: 'eip155:eoa',
+          },
+        },
+        selectedAccount: '694225f4-d30b-4e77-a900-c8bbce735b42',
+      },
     },
   };
 
@@ -242,9 +311,21 @@ describe('CustodyPage', function () {
     expect(screen.getByTestId('custody-accounts-empty')).toBeDefined();
   });
 
-  it('renders the list of custodians in mmiController when the user clicks on cancel button', async () => {
-    act(() => {
-      renderWithProvider(<CustodyPage />, store);
+  it('renders the list of custodians when the user clicks on cancel button', async () => {
+    const newMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          connectRequests: [],
+        },
+      },
+    };
+
+    const newStore = configureMockStore([thunk])(newMockStore);
+
+    await act(async () => {
+      renderWithProvider(<CustodyPage />, newStore);
     });
 
     await waitFor(() => {
@@ -252,7 +333,7 @@ describe('CustodyPage', function () {
       fireEvent.click(custodyBtns[0]);
     });
 
-    act(() => {
+    await act(async () => {
       const custodyCancelBtn = screen.getAllByTestId('custody-cancel-button');
       fireEvent.click(custodyCancelBtn[0]);
     });
@@ -393,6 +474,8 @@ describe('CustodyPage', function () {
             {
               ...mockStore.metamask.mmiConfiguration.custodians[0],
               displayName: 'Saturn Custody B',
+              isManualTokenInputSupported: false,
+              isQRCodeSupported: false,
             },
           ],
         },
diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js
index f04771b265eb..14f98047e4b5 100644
--- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js
+++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js
@@ -4,7 +4,10 @@ import PropTypes from 'prop-types';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import { getInstitutionalConnectRequests } from '../../../ducks/institutional/institutional';
-import { getMetaMaskAccounts } from '../../../selectors';
+import {
+  getMetaMaskAccounts,
+  getSelectedInternalAccount,
+} from '../../../selectors';
 import CustodyLabels from '../../../components/institutional/custody-labels/custody-labels';
 import PulseLoader from '../../../components/ui/pulse-loader';
 import { INSTITUTIONAL_FEATURES_DONE_ROUTE } from '../../../helpers/constants/routes';
@@ -53,11 +56,11 @@ export default function InteractiveReplacementTokenPage({ history }) {
     (state) => state.appState.modal.modalState.props?.address,
   );
   const {
-    selectedAddress,
     custodyAccountDetails,
     interactiveReplacementToken,
     mmiConfiguration,
   } = useSelector((state) => state.metamask);
+  const { address: selectedAddress } = useSelector(getSelectedInternalAccount);
   const { custodianName } =
     custodyAccountDetails[toChecksumHexAddress(address || selectedAddress)] ||
     {};
diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.stories.js b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.stories.js
index 73a07a137ad3..987c51a07e78 100644
--- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.stories.js
+++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.stories.js
@@ -11,7 +11,6 @@ const customData = {
   metamask: {
     ...testData.metamask,
     modal: { props: address },
-    selectedAddress: address,
     interactiveReplacementToken: {
       url: 'https://saturn-custody-ui.codefi.network/',
     },
diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js
index 5afd89ee8fb3..9382321e1cb2 100644
--- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js
+++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.js
@@ -7,6 +7,7 @@ import mockState from '../../../../test/data/mock-state.json';
 import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { shortenAddress } from '../../../helpers/utils/util';
+import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
 import InteractiveReplacementTokenPage from '.';
 
 const custodianAccounts = [
@@ -82,12 +83,16 @@ const props = {
 };
 
 const render = ({ newState } = {}) => {
+  const mockSelectedInternalAccount = {
+    ...getSelectedInternalAccountFromMockState(mockState),
+    address,
+  };
+
   const state = {
     ...mockState,
     metamask: {
       ...mockState.metamask,
       modal: { props: address },
-      selectedAddress: address,
       interactiveReplacementToken: {
         url: 'https://saturn-custody-ui.codefi.network/',
       },
@@ -109,6 +114,14 @@ const render = ({ newState } = {}) => {
       institutionalFeatures: {
         connectRequests,
       },
+
+      internalAccounts: {
+        ...mockState.metamask.internalAccounts,
+        accounts: {
+          ...mockState.metamask.internalAccounts.accounts,
+          [mockSelectedInternalAccount.id]: mockSelectedInternalAccount,
+        },
+      },
       ...newState,
     },
   };
diff --git a/ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js b/ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js
index 008c5bf516b7..57964793bd23 100644
--- a/ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js
+++ b/ui/pages/institutional/pin-mmi-billboard/pin-mmi-billboard.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 import React from 'react';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 
diff --git a/ui/pages/institutional/remind-srp/__snapshots__/remind-srp.test.tsx.snap b/ui/pages/institutional/remind-srp/__snapshots__/remind-srp.test.tsx.snap
new file mode 100644
index 000000000000..79cd5fb606bd
--- /dev/null
+++ b/ui/pages/institutional/remind-srp/__snapshots__/remind-srp.test.tsx.snap
@@ -0,0 +1,252 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RemindSRP should match snapshot 1`] = `
+<div>
+  <div
+    class="mm-box"
+  >
+    <div
+      class="mm-box mm-box--margin-bottom-4 mm-box--justify-content-center mm-box--text-align-center"
+    >
+      <h2
+        class="mm-box mm-text mm-text--heading-lg mm-text--font-weight-bold mm-box--margin-bottom-4 mm-box--color-text-default"
+      >
+        Secret Recovery Phrase
+      </h2>
+      <h4
+        class="mm-box mm-text mm-text--heading-sm mm-text--font-weight-normal mm-text--text-align-center mm-box--color-text-default"
+      >
+        MetaMask Institutional allows you to use non-custodial accounts, if you plan to use these accounts backup the Secret Recovery Phrase.
+      </h4>
+    </div>
+    <div
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent"
+      >
+        <span
+          class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
+          style="mask-image: url('./images/icons/eye.svg');"
+        />
+        Reveal seed phrase
+      </button>
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent"
+      >
+        <span
+          class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
+          style="mask-image: url('./images/icons/copy.svg');"
+        />
+        Copy to clipboard
+      </button>
+    </div>
+    <div
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row"
+    >
+      <div
+        class="box recovery-phrase__secret box--margin-bottom-4 box--padding-4 box--display-grid box--flex-direction-row box--rounded-md box--border-style-solid box--border-color-border-muted box--border-width-1"
+      >
+        <div
+          class="recovery-phrase__chips recovery-phrase__chips--hidden"
+          data-testid="recovery-phrase-chips"
+        >
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              1.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-0"
+            >
+              debris
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              2.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-1"
+            >
+              dizzy
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              3.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-2"
+            >
+              just
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              4.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-3"
+            >
+              program
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              5.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-4"
+            >
+              just
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              6.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-5"
+            >
+              float
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              7.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-6"
+            >
+              decrease
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              8.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-7"
+            >
+              vacant
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              9.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-8"
+            >
+              alarm
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              10.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-9"
+            >
+              reduce
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              11.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-10"
+            >
+              speak
+            </div>
+          </div>
+          <div
+            class="recovery-phrase__chip-item"
+          >
+            <div
+              class="recovery-phrase__chip-item__number"
+            >
+              12.
+            </div>
+            <div
+              class="recovery-phrase__chip chip chip--border-color-border-default chip--background-color-undefined chip--max-content"
+              data-testid="recovery-phrase-chip-11"
+            >
+              stadium
+            </div>
+          </div>
+        </div>
+        <div
+          class="recovery-phrase__secret-blocker"
+        />
+      </div>
+    </div>
+    <div
+      class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+    >
+      <button
+        class="button btn--rounded btn-primary btn--large recovery-phrase-continue"
+        data-testid="recovery-phrase-continue"
+      >
+        Continue
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/institutional/remind-srp/index.scss b/ui/pages/institutional/remind-srp/index.scss
new file mode 100644
index 000000000000..e138c4e703e2
--- /dev/null
+++ b/ui/pages/institutional/remind-srp/index.scss
@@ -0,0 +1,3 @@
+.recovery-phrase-continue {
+  max-width: 320px;
+}
diff --git a/ui/pages/institutional/remind-srp/remind-srp.test.tsx b/ui/pages/institutional/remind-srp/remind-srp.test.tsx
new file mode 100644
index 000000000000..b27ed0c0b79c
--- /dev/null
+++ b/ui/pages/institutional/remind-srp/remind-srp.test.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import { RemindSRP } from './remind-srp';
+
+const TEST_SEED =
+  'debris dizzy just program just float decrease vacant alarm reduce speak stadium';
+
+const render = () => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+    },
+  });
+  return renderWithProvider(
+    <RemindSRP secretRecoveryPhrase={TEST_SEED} />,
+    store,
+  );
+};
+
+describe('RemindSRP', () => {
+  it('should match snapshot', () => {
+    const { container } = render();
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render some UI elements', () => {
+    render();
+    expect(screen.getByText('Secret Recovery Phrase')).toBeInTheDocument();
+
+    expect(screen.getByText('Copy to clipboard')).toBeInTheDocument();
+  });
+
+  it('should render the 12 SRP words', () => {
+    const { queryAllByTestId } = render();
+
+    expect(queryAllByTestId(/recovery-phrase-chip-/u)).toHaveLength(12);
+  });
+});
diff --git a/ui/pages/institutional/remind-srp/remind-srp.tsx b/ui/pages/institutional/remind-srp/remind-srp.tsx
new file mode 100644
index 000000000000..bb16e192565b
--- /dev/null
+++ b/ui/pages/institutional/remind-srp/remind-srp.tsx
@@ -0,0 +1,133 @@
+import React, { useState } from 'react';
+import { useHistory } from 'react-router-dom';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
+import {
+  Box,
+  Text,
+  ButtonVariant,
+  Button as NewButton,
+  ButtonSize,
+  IconName,
+} from '../../../components/component-library';
+// Using the old one since they have different properties and this one looks better
+import Button from '../../../components/ui/button';
+
+import {
+  AlignItems,
+  BlockSize,
+  Display,
+  FlexDirection,
+  FontWeight,
+  IconColor,
+  JustifyContent,
+  TextAlign,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+
+import { ONBOARDING_PIN_EXTENSION_ROUTE } from '../../../helpers/constants/routes';
+import RecoveryPhraseChips from '../../onboarding-flow/recovery-phrase/recovery-phrase-chips';
+
+/**
+ * Displays a SRP reminder to the user
+ *
+ * @param props
+ * @param props.secretRecoveryPhrase
+ * @returns
+ */
+export const RemindSRP: React.FC<{ secretRecoveryPhrase: string }> = ({
+  secretRecoveryPhrase,
+}) => {
+  const t = useI18nContext();
+  const history = useHistory();
+  const [copied, handleCopy] = useCopyToClipboard() as [
+    boolean,
+    (value: string) => void,
+  ];
+  const [phraseRevealed, setPhraseRevealed] = useState(false);
+  const [hiddenPhrase, setHiddenPhrase] = useState(true);
+
+  return (
+    <Box>
+      <Box
+        justifyContent={JustifyContent.center}
+        textAlign={TextAlign.Center}
+        marginBottom={4}
+      >
+        <Text
+          fontWeight={FontWeight.Bold}
+          variant={TextVariant.headingLg}
+          marginBottom={4}
+        >
+          {t('secretRecoveryPhrase')}
+        </Text>
+
+        <Text
+          textAlign={TextAlign.Center}
+          fontWeight={FontWeight.Normal}
+          variant={TextVariant.headingSm}
+        >
+          {t('nonCustodialAccounts')}
+        </Text>
+      </Box>
+      <Box
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        width={BlockSize.Full}
+      >
+        <NewButton
+          variant={ButtonVariant.Link}
+          startIconName={hiddenPhrase ? IconName.Eye : IconName.EyeSlash}
+          color={IconColor.primaryDefault}
+          width={BlockSize.Full}
+          size={ButtonSize.Sm}
+          onClick={() => {
+            setHiddenPhrase(!hiddenPhrase);
+            setPhraseRevealed(true);
+          }}
+        >
+          {hiddenPhrase ? t('revealTheSeedPhrase') : t('hideSeedPhrase')}
+        </NewButton>
+
+        <NewButton
+          variant={ButtonVariant.Link}
+          startIconName={copied ? IconName.CopySuccess : IconName.Copy}
+          color={IconColor.primaryDefault}
+          width={BlockSize.Full}
+          size={ButtonSize.Sm}
+          onClick={() => handleCopy(secretRecoveryPhrase)}
+        >
+          {copied ? t('copiedExclamation') : t('copyToClipboard')}
+        </NewButton>
+      </Box>
+
+      <Box display={Display.Flex} flexDirection={FlexDirection.Row}>
+        <RecoveryPhraseChips
+          secretRecoveryPhrase={secretRecoveryPhrase.split(' ')}
+          phraseRevealed={phraseRevealed && !hiddenPhrase}
+          hiddenPhrase={hiddenPhrase}
+        />
+      </Box>
+
+      <Box
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        alignItems={AlignItems.center}
+      >
+        <Button
+          data-testid="recovery-phrase-continue"
+          className="recovery-phrase-continue"
+          icon={null}
+          type="primary"
+          large
+          onClick={() => {
+            history.replace(ONBOARDING_PIN_EXTENSION_ROUTE);
+          }}
+        >
+          {t('continue')}
+        </Button>
+      </Box>
+    </Box>
+  );
+};
diff --git a/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap b/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap
index 9b0bd89d8cfb..ace866477762 100644
--- a/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap
+++ b/ui/pages/onboarding-flow/add-network-modal/__snapshots__/add-network-modal.test.js.snap
@@ -175,6 +175,16 @@ exports[`Add Network Modal should render 1`] = `
             value=""
           />
         </div>
+        <div
+          class="mm-box mm-text mm-help-text mm-form-text-field__help-text mm-text--body-xs mm-box--margin-top-1 mm-box--color-text-default"
+        >
+          <span
+            class="mm-box mm-text mm-text--body-sm mm-box--color-text-default"
+            data-testid="network-form-ticker-suggestion"
+          >
+            Suggested ticker symbol:
+          </span>
+        </div>
       </div>
       <div
         class="form-field"
diff --git a/ui/pages/onboarding-flow/create-password/create-password.js b/ui/pages/onboarding-flow/create-password/create-password.js
index aa3b47a73b5f..7d60c301933e 100644
--- a/ui/pages/onboarding-flow/create-password/create-password.js
+++ b/ui/pages/onboarding-flow/create-password/create-password.js
@@ -15,7 +15,7 @@ import {
 import {
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   ONBOARDING_PIN_EXTENSION_ROUTE,
-  MMI_ONBOARDING_COMPLETION_ROUTE,
+  SRP_REMINDER,
   ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   ONBOARDING_COMPLETION_ROUTE,
@@ -106,7 +106,7 @@ export default function CreatePassword({
         ///: END:ONLY_INCLUDE_IF
 
         ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        history.replace(MMI_ONBOARDING_COMPLETION_ROUTE);
+        history.replace(SRP_REMINDER);
         ///: END:ONLY_INCLUDE_IF
       }
     }
@@ -226,7 +226,7 @@ export default function CreatePassword({
         ///: END:ONLY_INCLUDE_IF
 
         ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        history.push(ONBOARDING_PIN_EXTENSION_ROUTE);
+        history.replace(SRP_REMINDER);
         ///: END:ONLY_INCLUDE_IF
       } catch (error) {
         setPasswordError(error.message);
diff --git a/ui/pages/onboarding-flow/create-password/create-password.test.js b/ui/pages/onboarding-flow/create-password/create-password.test.js
index d08d448e9a57..7fcd3964ec28 100644
--- a/ui/pages/onboarding-flow/create-password/create-password.test.js
+++ b/ui/pages/onboarding-flow/create-password/create-password.test.js
@@ -24,8 +24,6 @@ jest.mock('react-router-dom', () => ({
 describe('Onboarding Create Password', () => {
   const mockState = {
     metamask: {
-      identities: {},
-      selectedAddress: '',
       internalAccounts: {
         accounts: {},
         selectedAccount: '',
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index 3abda65c2af0..13f1db52d6f8 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -13,8 +13,8 @@ import Button from '../../../components/ui/button';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { setParticipateInMetaMetrics } from '../../../store/actions';
 import {
-  getFirstTimeFlowTypeRoute,
   getFirstTimeFlowType,
+  getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn,
 } from '../../../selectors';
 
 import {
@@ -38,7 +38,7 @@ export default function OnboardingMetametrics() {
   const dispatch = useDispatch();
   const history = useHistory();
 
-  const nextRoute = useSelector(getFirstTimeFlowTypeRoute);
+  const nextRoute = useSelector(getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn);
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
 
   const trackEvent = useContext(MetaMetricsContext);
diff --git a/ui/pages/onboarding-flow/onboarding-flow.js b/ui/pages/onboarding-flow/onboarding-flow.js
index f2fe2a2315c1..180d6cd68c70 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.js
@@ -17,6 +17,7 @@ import {
   ONBOARDING_COMPLETION_ROUTE,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   MMI_ONBOARDING_COMPLETION_ROUTE,
+  SRP_REMINDER,
   ///: END:ONLY_INCLUDE_IF
   ONBOARDING_IMPORT_WITH_SRP_ROUTE,
   ONBOARDING_PIN_EXTENSION_ROUTE,
@@ -28,7 +29,7 @@ import {
   unlockAndGetSeedPhrase,
   createNewVaultAndRestore,
 } from '../../store/actions';
-import { getFirstTimeFlowTypeRoute } from '../../selectors';
+import { getFirstTimeFlowTypeRouteAfterUnlock } from '../../selectors';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import Button from '../../components/ui/button';
 import RevealSRPModal from '../../components/app/reveal-SRP-modal';
@@ -42,6 +43,7 @@ import ExperimentalArea from '../../components/app/flask/experimental-area';
 ///: END:ONLY_INCLUDE_IF
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import OnboardingSuccessful from '../institutional/onboarding-successful/onboarding-successful';
+import { RemindSRP } from '../institutional/remind-srp/remind-srp';
 ///: END:ONLY_INCLUDE_IF
 import OnboardingFlowSwitch from './onboarding-flow-switch/onboarding-flow-switch';
 import CreatePassword from './create-password/create-password';
@@ -64,7 +66,7 @@ export default function OnboardingFlow() {
   const history = useHistory();
   const t = useI18nContext();
   const completedOnboarding = useSelector(getCompletedOnboarding);
-  const nextRoute = useSelector(getFirstTimeFlowTypeRoute);
+  const nextRoute = useSelector(getFirstTimeFlowTypeRouteAfterUnlock);
   const isFromReminder = new URLSearchParams(search).get('isFromReminder');
   const trackEvent = useContext(MetaMetricsContext);
 
@@ -169,6 +171,12 @@ export default function OnboardingFlow() {
             path={MMI_ONBOARDING_COMPLETION_ROUTE}
             component={OnboardingSuccessful}
           />
+          <Route
+            path={SRP_REMINDER}
+            render={() => (
+              <RemindSRP secretRecoveryPhrase={secretRecoveryPhrase} />
+            )}
+          />
           {
             ///: END:ONLY_INCLUDE_IF
           }
diff --git a/ui/pages/onboarding-flow/onboarding-flow.test.js b/ui/pages/onboarding-flow/onboarding-flow.test.js
index e1f34cc557b6..7b38faa9cf38 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.test.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.test.js
@@ -35,7 +35,6 @@ jest.mock('../../store/actions', () => ({
 describe('Onboarding Flow', () => {
   const mockState = {
     metamask: {
-      identities: {},
       internalAccounts: {
         accounts: {},
         selectedAccount: '',
@@ -54,6 +53,9 @@ describe('Onboarding Flow', () => {
     localeMessages: {
       currentLocale: 'en',
     },
+    appState: {
+      externalServicesOnboardingToggleState: true,
+    },
   };
 
   process.env.METAMASK_BUILD_TYPE = 'main';
diff --git a/ui/pages/onboarding-flow/pin-extension/pin-billboard.js b/ui/pages/onboarding-flow/pin-extension/pin-billboard.js
index 0cc28daf06b1..d4a707cb1f12 100644
--- a/ui/pages/onboarding-flow/pin-extension/pin-billboard.js
+++ b/ui/pages/onboarding-flow/pin-extension/pin-billboard.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 import React from 'react';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 0de51a5d14eb..aa05f037b0f8 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -33,6 +33,7 @@ import {
   getAllNetworks,
   getCurrentNetwork,
   getPetnamesEnabled,
+  getExternalServicesOnboardingToggleState,
 } from '../../../selectors';
 import {
   setCompletedOnboarding,
@@ -46,9 +47,14 @@ import {
   showModal,
   toggleNetworkMenu,
   setIncomingTransactionsPreferences,
+  toggleExternalServices,
   setUseTransactionSimulations,
   setPetnamesEnabled,
 } from '../../../store/actions';
+import {
+  onboardingToggleBasicFunctionalityOn,
+  openBasicFunctionalityModal,
+} from '../../../ducks/app/app';
 import IncomingTransactionToggle from '../../../components/app/incoming-trasaction-toggle/incoming-transaction-toggle';
 import { Setting } from './setting';
 
@@ -97,7 +103,12 @@ export default function PrivacySettings() {
   const currentNetwork = useSelector(getCurrentNetwork);
   const allNetworks = useSelector(getAllNetworks);
 
+  const externalServicesOnboardingToggleState = useSelector(
+    getExternalServicesOnboardingToggleState,
+  );
+
   const handleSubmit = () => {
+    dispatch(toggleExternalServices(externalServicesOnboardingToggleState));
     dispatch(setUsePhishDetect(usePhishingDetection));
     dispatch(setUse4ByteResolution(turnOn4ByteResolution));
     dispatch(setUseTokenDetection(turnOnTokenDetection));
@@ -156,6 +167,20 @@ export default function PrivacySettings() {
           className="privacy-settings__settings"
           data-testid="privacy-settings-settings"
         >
+          <Setting
+            dataTestId="basic-functionality-toggle"
+            value={externalServicesOnboardingToggleState}
+            setValue={(toggledValue) => {
+              if (toggledValue === false) {
+                dispatch(openBasicFunctionalityModal());
+              } else {
+                dispatch(onboardingToggleBasicFunctionalityOn());
+              }
+            }}
+            title={t('basicConfigurationLabel')}
+            description={t('basicConfigurationDescription')}
+          />
+
           <IncomingTransactionToggle
             allNetworks={allNetworks}
             setIncomingTransactionsPreferences={(chainId, 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 e7e391214179..ba5b524fd209 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
@@ -5,8 +5,23 @@ import thunk from 'redux-thunk';
 import { setBackgroundConnection } from '../../../store/background-connection';
 import { renderWithProvider } from '../../../../test/jest';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { SHOW_BASIC_FUNCTIONALITY_MODAL_OPEN } from '../../../store/actionConstants';
 import PrivacySettings from './privacy-settings';
 
+const mockOpenBasicFunctionalityModal = jest.fn().mockImplementation(() => {
+  return {
+    type: SHOW_BASIC_FUNCTIONALITY_MODAL_OPEN,
+  };
+});
+
+jest.mock('../../../ducks/app/app.ts', () => {
+  return {
+    openBasicFunctionalityModal: () => {
+      return mockOpenBasicFunctionalityModal();
+    },
+  };
+});
+
 describe('Privacy Settings Onboarding View', () => {
   const mockStore = {
     metamask: {
@@ -32,6 +47,10 @@ describe('Privacy Settings Onboarding View', () => {
       ipfsGateway: 'test.link',
       useAddressBarEnsResolution: true,
       useTransactionSimulations: true,
+      useExternalServices: true,
+    },
+    appState: {
+      externalServicesOnboardingToggleState: true,
     },
   };
 
@@ -48,6 +67,8 @@ describe('Privacy Settings Onboarding View', () => {
   const setUseMultiAccountBalanceCheckerStub = jest.fn();
   const setUseAddressBarEnsResolutionStub = jest.fn();
   const setIncomingTransactionsPreferencesStub = jest.fn();
+  const onboardingToggleBasicFunctionalityOnStub = jest.fn();
+  const toggleExternalServicesStub = jest.fn();
   const setUseTransactionSimulationsStub = jest.fn();
   const setPreferenceStub = jest.fn();
 
@@ -62,6 +83,9 @@ describe('Privacy Settings Onboarding View', () => {
     setUseMultiAccountBalanceChecker: setUseMultiAccountBalanceCheckerStub,
     setUseAddressBarEnsResolution: setUseAddressBarEnsResolutionStub,
     setIncomingTransactionsPreferences: setIncomingTransactionsPreferencesStub,
+    toggleExternalServices: toggleExternalServicesStub,
+    onboardingToggleBasicFunctionalityOn:
+      onboardingToggleBasicFunctionalityOnStub,
     setUseTransactionSimulations: setUseTransactionSimulationsStub,
     setPreference: setPreferenceStub,
   });
@@ -72,6 +96,7 @@ describe('Privacy Settings Onboarding View', () => {
       store,
     );
     // All settings are initialized toggled to be same as default
+    expect(toggleExternalServicesStub).toHaveBeenCalledTimes(0);
     expect(setUsePhishDetectStub).toHaveBeenCalledTimes(0);
     expect(setUse4ByteResolutionStub).toHaveBeenCalledTimes(0);
     expect(setUseTokenDetectionStub).toHaveBeenCalledTimes(0);
@@ -84,20 +109,27 @@ describe('Privacy Settings Onboarding View', () => {
 
     const toggles = container.querySelectorAll('input[type=checkbox]');
     const submitButton = getByText('Done');
+    // TODO: refactor this toggle array, not very readable
     // toggle to false
-    fireEvent.click(toggles[0]);
-    fireEvent.click(toggles[4]);
-    fireEvent.click(toggles[5]);
-    fireEvent.click(toggles[6]);
-    fireEvent.click(toggles[7]);
-    fireEvent.click(toggles[8]);
-    fireEvent.click(toggles[9]);
-    fireEvent.click(toggles[10]);
-    fireEvent.click(toggles[12]);
-
+    fireEvent.click(toggles[0]); // toggleExternalServicesStub
+    fireEvent.click(toggles[1]); // setIncomingTransactionsPreferencesStub
+    fireEvent.click(toggles[2]); // setIncomingTransactionsPreferencesStub (2)
+    fireEvent.click(toggles[3]); // setIncomingTransactionsPreferencesStub (3)
+    fireEvent.click(toggles[4]); // setIncomingTransactionsPreferencesStub (4)
+    fireEvent.click(toggles[5]); // setUsePhishDetectStub
+    fireEvent.click(toggles[6]); // setUse4ByteResolutionStub
+    fireEvent.click(toggles[7]); // setUseTokenDetectionStub
+    fireEvent.click(toggles[8]); // setUseMultiAccountBalanceCheckerStub
+    fireEvent.click(toggles[9]); // setUseTransactionSimulationsStub
+    fireEvent.click(toggles[10]); // setUseAddressBarEnsResolutionStub
+    fireEvent.click(toggles[11]); // setUseCurrencyRateCheckStub
+    fireEvent.click(toggles[12]); // setPreferenceStub
+
+    expect(mockOpenBasicFunctionalityModal).toHaveBeenCalledTimes(1);
     fireEvent.click(submitButton);
 
-    expect(setIncomingTransactionsPreferencesStub).toHaveBeenCalledTimes(2);
+    expect(toggleExternalServicesStub).toHaveBeenCalledTimes(1);
+    expect(setIncomingTransactionsPreferencesStub).toHaveBeenCalledTimes(4);
     expect(setUsePhishDetectStub).toHaveBeenCalledTimes(1);
     expect(setUse4ByteResolutionStub).toHaveBeenCalledTimes(1);
     expect(setUseTokenDetectionStub).toHaveBeenCalledTimes(1);
@@ -112,14 +144,15 @@ describe('Privacy Settings Onboarding View', () => {
       false,
       expect.anything(),
     );
-
+    // toggleExternalServices is true still because modal is "open" but not confirmed yet
+    expect(toggleExternalServicesStub.mock.calls[0][0]).toStrictEqual(true);
     expect(setUsePhishDetectStub.mock.calls[0][0]).toStrictEqual(false);
     expect(setUse4ByteResolutionStub.mock.calls[0][0]).toStrictEqual(false);
     expect(setUseTokenDetectionStub.mock.calls[0][0]).toStrictEqual(true);
     expect(setUseMultiAccountBalanceCheckerStub.mock.calls[0][0]).toStrictEqual(
       false,
     );
-    expect(setUseCurrencyRateCheckStub.mock.calls[0][0]).toStrictEqual(true);
+    expect(setUseCurrencyRateCheckStub.mock.calls[0][0]).toStrictEqual(false);
     expect(setUseAddressBarEnsResolutionStub.mock.calls[0][0]).toStrictEqual(
       false,
     );
diff --git a/ui/pages/onboarding-flow/privacy-settings/setting.js b/ui/pages/onboarding-flow/privacy-settings/setting.js
index db567684a350..804e16cad7b0 100644
--- a/ui/pages/onboarding-flow/privacy-settings/setting.js
+++ b/ui/pages/onboarding-flow/privacy-settings/setting.js
@@ -16,6 +16,7 @@ export const Setting = ({
   title,
   description,
   showToggle = true,
+  dataTestId,
 }) => {
   const t = useI18nContext();
 
@@ -27,6 +28,7 @@ export const Setting = ({
       marginTop={3}
       marginBottom={3}
       className="privacy-settings__setting__wrapper"
+      data-testid={dataTestId}
     >
       <div className="privacy-settings__setting">
         <Text variant={TextVariant.bodyMdMedium}>{title}</Text>
@@ -54,4 +56,5 @@ Setting.propTypes = {
   title: PropTypes.string,
   description: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
   showToggle: PropTypes.bool,
+  dataTestId: PropTypes.string,
 };
diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js
index a858d11a33c2..2b6c092af39a 100644
--- a/ui/pages/onboarding-flow/welcome/welcome.js
+++ b/ui/pages/onboarding-flow/welcome/welcome.js
@@ -58,6 +58,9 @@ export default function OnboardingWelcome() {
     if (currentKeyring) {
       if (firstTimeFlowType === FirstTimeFlowType.import) {
         history.replace(ONBOARDING_COMPLETION_ROUTE);
+      }
+      if (firstTimeFlowType === FirstTimeFlowType.restore) {
+        history.replace(ONBOARDING_COMPLETION_ROUTE);
       } else {
         history.replace(ONBOARDING_SECURE_YOUR_WALLET_ROUTE);
       }
@@ -101,7 +104,7 @@ export default function OnboardingWelcome() {
   ]);
 
   const onImportClick = async () => {
-    dispatch(setFirstTimeFlowType('import'));
+    dispatch(setFirstTimeFlowType(FirstTimeFlowType.import));
     trackEvent({
       category: MetaMetricsEventCategory.Onboarding,
       event: MetaMetricsEventName.OnboardingWalletImportStarted,
diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss
index 2cbefdd14071..506cee8ad8ac 100644
--- a/ui/pages/pages.scss
+++ b/ui/pages/pages.scss
@@ -17,6 +17,7 @@
 @import "institutional/institutional-entity-done-page/index";
 @import "institutional/confirm-add-custodian-token/index";
 @import "institutional/interactive-replacement-token-page/index";
+@import "institutional/remind-srp/index";
 @import 'keychains/index';
 @import 'notifications/index';
 @import 'onboarding-flow/index';
@@ -25,6 +26,7 @@
 @import 'snaps/snaps-list/index';
 @import 'snaps/snap-view/index';
 @import 'create-snap-account/index';
+@import 'smart-transactions/smart-transaction-status-page/index';
 @import 'remove-snap-account/index';
 @import 'swaps/index';
 @import 'token-details/index';
diff --git a/ui/pages/permissions-connect/choose-account/choose-account.js b/ui/pages/permissions-connect/choose-account/choose-account.js
index 035cb25edf29..c08ce6104ad8 100644
--- a/ui/pages/permissions-connect/choose-account/choose-account.js
+++ b/ui/pages/permissions-connect/choose-account/choose-account.js
@@ -2,10 +2,19 @@ import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { SubjectType } from '@metamask/permission-controller';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import PermissionsConnectHeader from '../../../components/app/permissions-connect-header';
 import PermissionsConnectFooter from '../../../components/app/permissions-connect-footer';
 import AccountList from '../../../components/ui/account-list';
 import { PageContainerFooter } from '../../../components/ui/page-container';
+import {
+  AlignItems,
+  BackgroundColor,
+  BlockSize,
+  Display,
+  FlexDirection,
+  JustifyContent,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import { Box, Text } from '../../../components/component-library';
 
 const ChooseAccount = ({
   selectedAccountAddresses,
@@ -65,15 +74,29 @@ const ChooseAccount = ({
 
   return (
     <>
-      <div className="permissions-connect-choose-account__content">
-        <PermissionsConnectHeader
-          iconUrl={targetSubjectMetadata?.iconUrl}
-          iconName={targetSubjectMetadata?.name}
-          headerTitle={t('connectWithMetaMask')}
-          headerText={headerText}
-          siteOrigin={targetSubjectMetadata?.origin}
-          subjectType={targetSubjectMetadata?.subjectType}
-        />
+      <Box
+        className="permissions-connect-choose-account__content"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        backgroundColor={BackgroundColor.backgroundAlternative}
+        width={BlockSize.Full}
+        height={BlockSize.Full}
+        paddingLeft={6}
+        paddingRight={6}
+      >
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          justifyContent={JustifyContent.center}
+          alignItems={AlignItems.center}
+          paddingTop={4}
+          paddingBottom={4}
+        >
+          <Text variant={TextVariant.headingMd}>
+            {t('connectWithMetaMask')}
+          </Text>
+          <Text variant={TextVariant.bodyMd}>{headerText}</Text>
+        </Box>
         <AccountList
           accounts={accounts}
           selectNewAccountViaModal={selectNewAccountViaModal}
@@ -85,8 +108,12 @@ const ChooseAccount = ({
           selectAll={selectAll}
           handleAccountClick={handleAccountClick}
         />
-      </div>
-      <div className="permissions-connect-choose-account__footer-container">
+      </Box>
+      <Box
+        backgroundColor={BackgroundColor.backgroundAlternative}
+        className="permissions-connect-choose-account__footer"
+        paddingTop={4}
+      >
         {targetSubjectMetadata?.subjectType !== SubjectType.Snap && (
           <PermissionsConnectFooter />
         )}
@@ -98,7 +125,7 @@ const ChooseAccount = ({
           submitText={t('next')}
           disabled={selectedAccounts.size === 0}
         />
-      </div>
+      </Box>
     </>
   );
 };
diff --git a/ui/pages/permissions-connect/choose-account/index.scss b/ui/pages/permissions-connect/choose-account/index.scss
index cdc88e7ac6ed..ea27f9219fe4 100644
--- a/ui/pages/permissions-connect/choose-account/index.scss
+++ b/ui/pages/permissions-connect/choose-account/index.scss
@@ -1,39 +1,13 @@
 @use "design-system";
 
 .permissions-connect-choose-account {
-  &__title {
-    @include design-system.H4;
-  }
-
-  &__cancel {
-    color: var(--color-error-default);
-  }
-
   &__content {
-    display: flex;
     overflow-y: auto;
-    flex-direction: column;
-    width: 100%;
-    padding-left: 24px;
-    padding-right: 24px;
-    margin-top: 2px;
   }
 
-  &__footer-container {
-    width: 100%;
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-
-    @include design-system.screen-sm-min {
-      flex-direction: column-reverse;
-      justify-content: space-between;
-      padding-bottom: 20px;
-    }
-
+  &__footer {
     .page-container__footer {
-      margin-top: 12px;
+      border-top: 0;
     }
   }
 }
diff --git a/ui/pages/permissions-connect/index.scss b/ui/pages/permissions-connect/index.scss
index 16b45e6eb6bf..513809505d50 100644
--- a/ui/pages/permissions-connect/index.scss
+++ b/ui/pages/permissions-connect/index.scss
@@ -5,7 +5,6 @@
 @import 'snaps/snap-update/index';
 @import 'snaps/snap-result/index';
 @import 'snaps/snaps-connect/index';
-@import 'redirect/index';
 
 .permissions-connect {
   width: 100%;
diff --git a/ui/pages/permissions-connect/permissions-connect.component.js b/ui/pages/permissions-connect/permissions-connect.component.js
index 15d04ef5536f..c147bb5cd67f 100644
--- a/ui/pages/permissions-connect/permissions-connect.component.js
+++ b/ui/pages/permissions-connect/permissions-connect.component.js
@@ -10,15 +10,15 @@ import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../shared/constants/app';
 import { MILLISECOND } from '../../../shared/constants/time';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import PermissionPageContainer from '../../components/app/permission-page-container';
-import {
-  Box,
-  Icon,
-  IconName,
-  IconSize,
-} from '../../components/component-library';
+import { Box } from '../../components/component-library';
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import SnapAuthorshipHeader from '../../components/app/snaps/snap-authorship-header/snap-authorship-header';
 ///: END:ONLY_INCLUDE_IF
+import PermissionConnectHeader from '../../components/app/permission-connect-header';
+import {
+  CaveatTypes,
+  RestrictedMethods,
+} from '../../../shared/constants/permissions';
 import ChooseAccount from './choose-account';
 import PermissionsRedirect from './redirect';
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
@@ -30,6 +30,20 @@ import SnapResult from './snaps/snap-result';
 
 const APPROVE_TIMEOUT = MILLISECOND * 1200;
 
+function getDefaultSelectedAccounts(currentAddress, permissionsRequest) {
+  const permission =
+    permissionsRequest.permissions?.[RestrictedMethods.eth_accounts];
+  const requestedAccounts = permission?.caveats?.find(
+    (caveat) => caveat.type === CaveatTypes.restrictReturnedAccounts,
+  )?.value;
+
+  if (requestedAccounts) {
+    return new Set(requestedAccounts.map((address) => address.toLowerCase()));
+  }
+
+  return new Set([currentAddress]);
+}
+
 export default class PermissionConnect extends Component {
   static propTypes = {
     approvePermissionsRequest: PropTypes.func.isRequired,
@@ -80,8 +94,6 @@ export default class PermissionConnect extends Component {
     snapsInstallPrivacyWarningShown: PropTypes.bool.isRequired,
     ///: END:ONLY_INCLUDE_IF
     hideTopBar: PropTypes.bool,
-    totalPages: PropTypes.string.isRequired,
-    page: PropTypes.string.isRequired,
     targetSubjectMetadata: PropTypes.shape({
       extensionId: PropTypes.string,
       iconUrl: PropTypes.string,
@@ -105,7 +117,10 @@ export default class PermissionConnect extends Component {
 
   state = {
     redirecting: false,
-    selectedAccountAddresses: new Set([this.props.currentAddress]),
+    selectedAccountAddresses: getDefaultSelectedAccounts(
+      this.props.currentAddress,
+      this.props.permissionsRequest,
+    ),
     permissionsApproved: null,
     origin: this.props.origin,
     targetSubjectMetadata: this.props.targetSubjectMetadata || {},
@@ -283,56 +298,26 @@ export default class PermissionConnect extends Component {
   }
 
   renderTopBar() {
-    const {
-      redirecting,
-      ///: BEGIN:ONLY_INCLUDE_IF(snaps)
-      targetSubjectMetadata,
-      ///: END:ONLY_INCLUDE_IF
-    } = this.state;
-    const { page, isRequestingAccounts, totalPages } = this.props;
-    const { t } = this.context;
-    return redirecting ? null : (
+    const { targetSubjectMetadata } = this.state;
+    return (
       <Box
         style={{
-          ///: BEGIN:ONLY_INCLUDE_IF(snaps)
-          marginBottom:
-            targetSubjectMetadata.subjectType === SubjectType.Snap && '14px',
           boxShadow:
             targetSubjectMetadata.subjectType === SubjectType.Snap &&
             'var(--shadow-size-lg) var(--color-shadow-default)',
-          ///: END:ONLY_INCLUDE_IF
         }}
       >
-        <div className="permissions-connect__top-bar">
-          {page === '2' && isRequestingAccounts ? (
-            <div
-              className="permissions-connect__back"
-              onClick={() => this.goBack()}
-            >
-              <Icon
-                name={IconName.ArrowLeft}
-                marginInlineEnd={1}
-                size={IconSize.Xs}
-              />
-              {t('back')}
-            </div>
-          ) : null}
-          {isRequestingAccounts ? (
-            <div className="permissions-connect__page-count">
-              {t('xOfY', [page, totalPages])}
-            </div>
-          ) : null}
-        </div>
-        {
-          ///: BEGIN:ONLY_INCLUDE_IF(snaps)
-          targetSubjectMetadata.subjectType === SubjectType.Snap && (
-            <SnapAuthorshipHeader
-              snapId={targetSubjectMetadata.origin}
-              boxShadow="none"
-            />
-          )
-          ///: END:ONLY_INCLUDE_IF
-        }
+        {targetSubjectMetadata.subjectType === SubjectType.Snap ? (
+          <SnapAuthorshipHeader
+            snapId={targetSubjectMetadata.origin}
+            boxShadow="none"
+          />
+        ) : (
+          <PermissionConnectHeader
+            origin={targetSubjectMetadata.origin}
+            iconUrl={targetSubjectMetadata.iconUrl}
+          />
+        )}
       </Box>
     );
   }
@@ -420,6 +405,8 @@ export default class PermissionConnect extends Component {
                     selectedAccountAddresses.has(account.address),
                   )}
                   targetSubjectMetadata={targetSubjectMetadata}
+                  history={this.props.history}
+                  connectPath={connectPath}
                   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
                   snapsInstallPrivacyWarningShown={
                     snapsInstallPrivacyWarningShown
diff --git a/ui/pages/permissions-connect/redirect/index.scss b/ui/pages/permissions-connect/redirect/index.scss
deleted file mode 100644
index a1a8c8047c72..000000000000
--- a/ui/pages/permissions-connect/redirect/index.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-.permissions-redirect {
-  display: flex;
-  height: 100%;
-  justify-content: center;
-
-  &__result {
-    position: absolute;
-    top: 30%;
-    text-align: center;
-    color: var(--color-text-default);
-  }
-
-  &__icons {
-    display: flex;
-    position: relative;
-  }
-
-  .icon-border {
-    max-width: 64px;
-    flex: 0 0 64px;
-  }
-
-  &__center-icon {
-    position: relative;
-    height: 64px;
-  }
-
-  &__icon {
-    width: 64px;
-  }
-
-  &__check {
-    width: 32px;
-    height: 32px;
-    color: var(--color-success-inverse);
-    background-color: var(--color-success-default);
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: absolute;
-
-    &::before {
-      content: '';
-      position: absolute;
-      left: 18%;
-      top: 25%;
-    }
-  }
-
-  &__dashed-line {
-    width: 130px;
-    border-bottom: 1px solid var(--color-border-muted);
-    border-style: dashed;
-  }
-}
diff --git a/ui/pages/permissions-connect/redirect/permissions-redirect.component.js b/ui/pages/permissions-connect/redirect/permissions-redirect.component.js
index 308e71925168..6a6ae58b8e4c 100644
--- a/ui/pages/permissions-connect/redirect/permissions-redirect.component.js
+++ b/ui/pages/permissions-connect/redirect/permissions-redirect.component.js
@@ -1,61 +1,132 @@
-import React, { useContext } from 'react';
+import React, { useContext, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import SiteIcon from '../../../components/ui/site-icon';
-import Box from '../../../components/ui/box';
-import Typography from '../../../components/ui/typography/typography';
 import {
-  TypographyVariant,
-  DISPLAY,
   JustifyContent,
   AlignItems,
+  Display,
+  TextVariant,
+  BlockSize,
+  FlexDirection,
+  BackgroundColor,
+  BorderRadius,
+  IconColor,
 } from '../../../helpers/constants/design-system';
 import { I18nContext } from '../../../contexts/i18n';
 import {
+  AvatarToken,
+  AvatarTokenSize,
+  Box,
+  Button,
+  ButtonSize,
+  ButtonVariant,
   Icon,
   IconName,
   IconSize,
+  Text,
 } from '../../../components/component-library';
+import PermissionsConnectFooter from '../../../components/app/permissions-connect-footer';
 
 export default function PermissionsRedirect({ subjectMetadata }) {
   const t = useContext(I18nContext);
+  const [cachedSubjectMetadata, setCachedSubjectMetadata] =
+    useState(subjectMetadata);
+
+  // While this redirecting screen is showing, the subject metadata will become invalidated
+  // for that reason we cache the last seen valid subject metadata and show that.
+  useEffect(() => {
+    if (subjectMetadata && subjectMetadata.origin) {
+      setCachedSubjectMetadata(subjectMetadata);
+    }
+  }, [subjectMetadata]);
 
   return (
-    <div className="permissions-redirect">
-      <div className="permissions-redirect__result">
-        <Typography
-          boxProps={{ marginBottom: 4 }}
-          variant={TypographyVariant.H3}
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      width={BlockSize.Full}
+      height={BlockSize.Full}
+      justifyContent={JustifyContent.spaceBetween}
+    >
+      <Box
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        alignItems={AlignItems.center}
+        justifyContent={JustifyContent.center}
+        width={BlockSize.Full}
+        height={BlockSize.Full}
+        backgroundColor={BackgroundColor.backgroundAlternative}
+      >
+        <Box display={Display.Flex} marginBottom={4}>
+          <Text variant={TextVariant.headingMd}>{t('connecting')}</Text>
+        </Box>
+        <Box
+          display={Display.Flex}
+          backgroundColor={BackgroundColor.infoMuted}
+          borderRadius={BorderRadius.pill}
+          padding={2}
         >
-          {t('connecting')}
-        </Typography>
-        <div className="permissions-redirect__icons">
-          <SiteIcon
-            icon={subjectMetadata.iconUrl}
-            name={subjectMetadata.name}
-            size={64}
-            className="permissions-redirect__site-icon"
+          <AvatarToken
+            src={cachedSubjectMetadata.iconUrl}
+            name={cachedSubjectMetadata.name}
+            size={AvatarTokenSize.Lg}
           />
           <Box
-            className="permissions-redirect__center-icon"
-            display={DISPLAY.FLEX}
+            display={Display.Flex}
             alignItems={AlignItems.center}
             justifyContent={JustifyContent.center}
+            paddingLeft={4}
+            paddingRight={4}
           >
             <Icon
-              name={IconName.Check}
-              size={IconSize.Lg}
-              className="permissions-redirect__check"
+              name={IconName.Confirmation}
+              size={IconSize.Xl}
+              color={IconColor.infoDefault}
             />
-            <div className="permissions-redirect__dashed-line" />
           </Box>
-          <SiteIcon
-            icon="/images/logo/metamask-fox.svg"
-            size={64}
-            className="permissions-redirect__site-icon"
+          <AvatarToken
+            src="/images/logo/metamask-fox.svg"
+            size={AvatarTokenSize.Lg}
+            name="metamask-fox"
           />
-        </div>
-      </div>
-    </div>
+        </Box>
+      </Box>
+      <Box backgroundColor={BackgroundColor.backgroundAlternative} padding={4}>
+        <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
+          <PermissionsConnectFooter />
+          <Box
+            display={Display.Flex}
+            paddingTop={4}
+            width={BlockSize.Full}
+            justifyContent={JustifyContent.center}
+            alignItems={AlignItems.center}
+          >
+            <Button
+              variant={ButtonVariant.Secondary}
+              size={ButtonSize.Lg}
+              width={BlockSize.Full}
+              marginRight={2}
+              disabled
+            >
+              {t('back')}
+            </Button>
+            <Button
+              variant={ButtonVariant.Primary}
+              size={ButtonSize.Lg}
+              width={BlockSize.Full}
+              marginLeft={2}
+              disabled
+              loading
+            >
+              <Icon
+                name={IconName.Loading}
+                size={IconSize.Lg}
+                color={IconColor.infoDefault}
+              />
+            </Button>
+          </Box>
+        </Box>
+      </Box>
+    </Box>
   );
 }
 
diff --git a/ui/pages/permissions-connect/snaps/snap-install/index.scss b/ui/pages/permissions-connect/snaps/snap-install/index.scss
index 6f8c53ead8b5..a4b012c7a954 100644
--- a/ui/pages/permissions-connect/snaps/snap-install/index.scss
+++ b/ui/pages/permissions-connect/snaps/snap-install/index.scss
@@ -1,19 +1,32 @@
+@use "design-system";
+
 .snap-install {
   box-shadow: none;
 
   &__content {
+    position: relative;
+
     &__loader-container {
       height: 100%;
     }
   }
 
+  &__scroll-button-area {
+    position: sticky;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    height: 48px;
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, var(--color-background-alternative) 100%);
+  }
+
   &__scroll-button {
     position: absolute;
+    left: 0;
+    right: 0;
     margin-left: auto;
     margin-right: auto;
-    right: 0;
-    left: 0;
-    bottom: 90px;
+    z-index: auto;
   }
 
   .page-container__footer {
diff --git a/ui/pages/permissions-connect/snaps/snap-install/snap-install.js b/ui/pages/permissions-connect/snaps/snap-install/snap-install.js
index 05af8743b8e2..10cab478714f 100644
--- a/ui/pages/permissions-connect/snaps/snap-install/snap-install.js
+++ b/ui/pages/permissions-connect/snaps/snap-install/snap-install.js
@@ -16,6 +16,7 @@ import {
   FontWeight,
   IconColor,
   Display,
+  BorderRadius,
 } from '../../../../helpers/constants/design-system';
 import { getSnapInstallWarnings } from '../util';
 import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader';
@@ -28,11 +29,11 @@ import {
 } from '../../../../components/component-library';
 import SnapPermissionsList from '../../../../components/app/snaps/snap-permissions-list';
 import { useScrollRequired } from '../../../../hooks/useScrollRequired';
-import SiteOrigin from '../../../../components/ui/site-origin/site-origin';
 import InstallError from '../../../../components/app/snaps/install-error/install-error';
 import { useOriginMetadata } from '../../../../hooks/useOriginMetadata';
 import { getSnapMetadata, getSnapsMetadata } from '../../../../selectors';
 import { getSnapName } from '../../../../helpers/utils/util';
+import PermissionConnectHeader from '../../../../components/app/permission-connect-header';
 
 export default function SnapInstall({
   request,
@@ -43,7 +44,7 @@ export default function SnapInstall({
 }) {
   const t = useI18nContext();
   const siteMetadata = useOriginMetadata(request?.metadata?.dappOrigin) || {};
-  const { origin, iconUrl, name } = siteMetadata;
+  const { origin, iconUrl } = siteMetadata;
   const [isShowingWarning, setIsShowingWarning] = useState(false);
   const snapsMetadata = useSelector(getSnapsMetadata);
 
@@ -92,34 +93,21 @@ export default function SnapInstall({
     } else if (isLoading) {
       return 'connect';
     }
-    return 'install';
+    return 'confirm';
   };
 
   return (
     <Box
-      className="page-container snap-install"
+      className="snap-install"
       display={Display.Flex}
       justifyContent={JustifyContent.spaceBetween}
       height={BlockSize.Full}
       borderStyle={BorderStyle.none}
       flexDirection={FlexDirection.Column}
+      backgroundColor={BackgroundColor.backgroundAlternative}
     >
       {isLoading || hasError ? (
-        <Box
-          display={Display.Flex}
-          width="full"
-          alignItems={AlignItems.center}
-          justifyContent={JustifyContent.center}
-          paddingTop={4}
-        >
-          <SiteOrigin
-            chip
-            siteOrigin={origin}
-            title={origin}
-            iconSrc={iconUrl}
-            iconName={name}
-          />
-        </Box>
+        <PermissionConnectHeader origin={origin} iconUrl={iconUrl} />
       ) : (
         <SnapAuthorshipHeader snapId={targetSubjectMetadata.origin} />
       )}
@@ -131,6 +119,8 @@ export default function SnapInstall({
           overflowY: 'auto',
           flex: !isLoading && !hasError && '1',
         }}
+        paddingLeft={4}
+        paddingRight={4}
       >
         {isLoading && (
           <Box
@@ -158,7 +148,7 @@ export default function SnapInstall({
         {!hasError && !isLoading && (
           <>
             <Text
-              variant={TextVariant.headingLg}
+              variant={TextVariant.headingMd}
               paddingTop={4}
               paddingBottom={2}
               textAlign="center"
@@ -183,7 +173,15 @@ export default function SnapInstall({
                 </Text>,
               ])}
             </Text>
-            <Box marginLeft={4} marginRight={4} display={Display.Flex}>
+            <Box
+              display={Display.Flex}
+              backgroundColor={BackgroundColor.backgroundDefault}
+              paddingLeft={4}
+              paddingRight={4}
+              paddingTop={2}
+              paddingBottom={2}
+              borderRadius={BorderRadius.XL}
+            >
               <SnapPermissionsList
                 snapId={targetSubjectMetadata.origin}
                 snapName={snapName}
@@ -191,15 +189,17 @@ export default function SnapInstall({
               />
             </Box>
             {isScrollable && !isScrolledToBottom ? (
-              <AvatarIcon
-                className="snap-install__scroll-button"
-                data-testid="snap-install-scroll"
-                iconName={IconName.Arrow2Down}
-                backgroundColor={BackgroundColor.infoDefault}
-                color={IconColor.primaryInverse}
-                onClick={scrollToBottom}
-                style={{ cursor: 'pointer' }}
-              />
+              <Box className="snap-install__scroll-button-area">
+                <AvatarIcon
+                  className="snap-install__scroll-button"
+                  data-testid="snap-install-scroll"
+                  iconName={IconName.Arrow2Down}
+                  backgroundColor={BackgroundColor.infoDefault}
+                  color={IconColor.primaryInverse}
+                  onClick={scrollToBottom}
+                  style={{ cursor: 'pointer' }}
+                />
+              </Box>
             ) : null}
           </>
         )}
@@ -209,9 +209,7 @@ export default function SnapInstall({
         display={Display.Flex}
         alignItems={AlignItems.center}
         flexDirection={FlexDirection.Column}
-        style={{
-          boxShadow: 'var(--shadow-size-lg) var(--color-shadow-default)',
-        }}
+        backgroundColor={BackgroundColor.backgroundAlternative}
       >
         <PageContainerFooter
           cancelButtonType="default"
diff --git a/ui/pages/permissions-connect/snaps/snap-result/snap-result.js b/ui/pages/permissions-connect/snaps/snap-result/snap-result.js
index 1c22c34068be..9de8eea3b9d2 100644
--- a/ui/pages/permissions-connect/snaps/snap-result/snap-result.js
+++ b/ui/pages/permissions-connect/snaps/snap-result/snap-result.js
@@ -16,6 +16,7 @@ import {
   BackgroundColor,
   IconColor,
   TextAlign,
+  Display,
 } from '../../../../helpers/constants/design-system';
 import {
   AvatarIcon,
@@ -68,6 +69,7 @@ export default function SnapResult({
         height={BlockSize.Full}
         paddingTop={2}
         paddingBottom={2}
+        backgroundColor={BackgroundColor.backgroundAlternative}
       >
         <AvatarIcon
           className="snap-result__header__icon"
@@ -137,6 +139,7 @@ export default function SnapResult({
       height={BlockSize.Full}
       borderStyle={BorderStyle.none}
       flexDirection={FlexDirection.Column}
+      backgroundColor={BackgroundColor.backgroundAlternative}
     >
       <SnapAuthorshipHeader snapId={targetSubjectMetadata.origin} />
       <Box
@@ -148,13 +151,17 @@ export default function SnapResult({
         style={{
           overflowY: 'auto',
         }}
+        backgroundColor={BackgroundColor.backgroundAlternative}
+        height={BlockSize.Full}
       >
         {isLoading && (
           <Box
             className="snap-result__content__loader-container"
+            display={Display.Flex}
             flexDirection={FlexDirection.Column}
             alignItems={AlignItems.center}
             justifyContent={JustifyContent.center}
+            height={BlockSize.Full}
           >
             <PulseLoader />
           </Box>
@@ -168,9 +175,7 @@ export default function SnapResult({
         className="snap-result__footer"
         alignItems={AlignItems.center}
         flexDirection={FlexDirection.Column}
-        style={{
-          boxShadow: 'var(--shadow-size-lg) var(--color-shadow-default)',
-        }}
+        backgroundColor={BackgroundColor.backgroundAlternative}
       >
         <PageContainerFooter
           hideCancel
diff --git a/ui/pages/permissions-connect/snaps/snap-update/index.scss b/ui/pages/permissions-connect/snaps/snap-update/index.scss
index 564b7f9fbe73..bf2c7adc7fe2 100644
--- a/ui/pages/permissions-connect/snaps/snap-update/index.scss
+++ b/ui/pages/permissions-connect/snaps/snap-update/index.scss
@@ -1,19 +1,32 @@
+@use "design-system";
+
 .snap-update {
   box-shadow: none;
 
   &__content {
+    position: relative;
+
     &__loader-container {
       height: 100%;
     }
   }
 
+  &__scroll-button-area {
+    position: sticky;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    height: 48px;
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, var(--color-background-alternative) 100%);
+  }
+
   &__scroll-button {
     position: absolute;
+    left: 0;
+    right: 0;
     margin-left: auto;
     margin-right: auto;
-    right: 0;
-    left: 0;
-    bottom: 90px;
+    z-index: auto;
   }
 
   .page-container__footer {
diff --git a/ui/pages/permissions-connect/snaps/snap-update/snap-update.js b/ui/pages/permissions-connect/snaps/snap-update/snap-update.js
index fc1ac9fa21f8..7d4a13903c61 100644
--- a/ui/pages/permissions-connect/snaps/snap-update/snap-update.js
+++ b/ui/pages/permissions-connect/snaps/snap-update/snap-update.js
@@ -4,18 +4,19 @@ import { useSelector } from 'react-redux';
 import { PageContainerFooter } from '../../../../components/ui/page-container';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import SnapInstallWarning from '../../../../components/app/snaps/snap-install-warning';
-import Box from '../../../../components/ui/box/box';
 import {
   AlignItems,
   BackgroundColor,
-  BLOCK_SIZES,
   BorderStyle,
-  FLEX_DIRECTION,
   FontWeight,
   JustifyContent,
   TextVariant,
-  TEXT_ALIGN,
   IconColor,
+  Display,
+  BorderRadius,
+  BlockSize,
+  FlexDirection,
+  TextAlign,
 } from '../../../../helpers/constants/design-system';
 
 import UpdateSnapPermissionList from '../../../../components/app/snaps/update-snap-permission-list';
@@ -25,8 +26,8 @@ import InstallError from '../../../../components/app/snaps/install-error/install
 import SnapAuthorshipHeader from '../../../../components/app/snaps/snap-authorship-header';
 import {
   AvatarIcon,
+  Box,
   IconName,
-  ValidTag,
   Text,
 } from '../../../../components/component-library';
 import { useScrollRequired } from '../../../../hooks/useScrollRequired';
@@ -91,11 +92,13 @@ export default function SnapUpdate({
 
   return (
     <Box
-      className="page-container snap-update"
+      className="snap-update"
+      display={Display.Flex}
       justifyContent={JustifyContent.spaceBetween}
-      height={BLOCK_SIZES.FULL}
+      height={BlockSize.Full}
       borderStyle={BorderStyle.none}
-      flexDirection={FLEX_DIRECTION.COLUMN}
+      flexDirection={FlexDirection.Column}
+      backgroundColor={BackgroundColor.backgroundAlternative}
     >
       <SnapAuthorshipHeader snapId={targetSubjectMetadata.origin} />
       <Box
@@ -106,12 +109,14 @@ export default function SnapUpdate({
           overflowY: 'auto',
           flex: !isLoading && '1',
         }}
+        paddingLeft={4}
+        paddingRight={4}
       >
         {!isLoading && !hasError && (
           <Text
-            paddingBottom={4}
             paddingTop={4}
-            variant={TextVariant.headingLg}
+            paddingBottom={2}
+            variant={TextVariant.headingMd}
             textAlign="center"
           >
             {t('updateRequest')}
@@ -120,7 +125,8 @@ export default function SnapUpdate({
         {isLoading && (
           <Box
             className="snap-update__content__loader-container"
-            flexDirection={FLEX_DIRECTION.COLUMN}
+            display={Display.Flex}
+            flexDirection={FlexDirection.Column}
             alignItems={AlignItems.center}
             justifyContent={JustifyContent.center}
           >
@@ -133,7 +139,7 @@ export default function SnapUpdate({
             error={requestState.error}
             title={t('snapUpdateErrorTitle')}
             description={t('snapUpdateErrorDescription', [
-              <Text as={ValidTag.Span} key="1" fontWeight={FontWeight.Medium}>
+              <Text as="span" key="1" fontWeight={FontWeight.Medium}>
                 {snapName}
               </Text>,
             ])}
@@ -146,11 +152,11 @@ export default function SnapUpdate({
               paddingBottom={4}
               paddingLeft={4}
               paddingRight={4}
-              textAlign={TEXT_ALIGN.CENTER}
+              textAlign={TextAlign.Center}
             >
               {t('snapUpdateRequest', [
                 <Text
-                  as={ValidTag.Span}
+                  as="span"
                   key="2"
                   variant={TextVariant.bodyMd}
                   fontWeight={FontWeight.Medium}
@@ -158,7 +164,7 @@ export default function SnapUpdate({
                   {snapName}
                 </Text>,
                 <Text
-                  as={ValidTag.Span}
+                  as="span"
                   key="3"
                   variant={TextVariant.bodyMd}
                   fontWeight={FontWeight.Medium}
@@ -167,7 +173,15 @@ export default function SnapUpdate({
                 </Text>,
               ])}
             </Text>
-            <Box marginLeft={4} marginRight={4}>
+            <Box
+              display={Display.Flex}
+              backgroundColor={BackgroundColor.backgroundDefault}
+              paddingLeft={4}
+              paddingRight={4}
+              paddingTop={2}
+              paddingBottom={2}
+              borderRadius={BorderRadius.XL}
+            >
               <UpdateSnapPermissionList
                 approvedPermissions={approvedPermissions}
                 revokedPermissions={revokedPermissions}
@@ -176,26 +190,27 @@ export default function SnapUpdate({
               />
             </Box>
             {isScrollable && !isScrolledToBottom ? (
-              <AvatarIcon
-                className="snap-install__scroll-button"
-                data-testid="snap-update-scroll"
-                iconName={IconName.Arrow2Down}
-                backgroundColor={BackgroundColor.infoDefault}
-                color={IconColor.primaryInverse}
-                onClick={scrollToBottom}
-                style={{ cursor: 'pointer' }}
-              />
+              <Box className="snap-update__scroll-button-area">
+                <AvatarIcon
+                  className="snap-install__scroll-button"
+                  data-testid="snap-update-scroll"
+                  iconName={IconName.Arrow2Down}
+                  backgroundColor={BackgroundColor.infoDefault}
+                  color={IconColor.primaryInverse}
+                  onClick={scrollToBottom}
+                  style={{ cursor: 'pointer' }}
+                />
+              </Box>
             ) : null}
           </>
         )}
       </Box>
       <Box
         className="snap-update__footer"
+        display={Display.Flex}
         alignItems={AlignItems.center}
-        flexDirection={FLEX_DIRECTION.COLUMN}
-        style={{
-          boxShadow: 'var(--shadow-size-lg) var(--color-shadow-default)',
-        }}
+        flexDirection={FlexDirection.Column}
+        backgroundColor={BackgroundColor.backgroundAlternative}
       >
         <PageContainerFooter
           cancelButtonType="default"
@@ -206,7 +221,7 @@ export default function SnapUpdate({
           onCancel={onCancel}
           cancelText={t('cancel')}
           onSubmit={handleSubmit}
-          submitText={t(hasError ? 'ok' : 'update')}
+          submitText={t(hasError ? 'ok' : 'confirm')}
         />
       </Box>
       {isShowingWarning && (
diff --git a/ui/pages/permissions-connect/snaps/snaps-connect/index.scss b/ui/pages/permissions-connect/snaps/snaps-connect/index.scss
index ac68ef73cb12..ca4892571cbe 100644
--- a/ui/pages/permissions-connect/snaps/snaps-connect/index.scss
+++ b/ui/pages/permissions-connect/snaps/snaps-connect/index.scss
@@ -1,13 +1,5 @@
 .snaps-connect {
-  overflow-y: hidden;
-
-  &__header {
-    width: 100%;
-  }
-
   .page-container__footer {
     border-top: 0;
-    margin-top: auto;
-    box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
   }
 }
diff --git a/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js b/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js
index 6232a20d435b..0ef95da18f89 100644
--- a/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js
+++ b/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js
@@ -2,13 +2,7 @@ import React, { useCallback, useState } from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import Box from '../../../../components/ui/box';
-import SiteOrigin from '../../../../components/ui/site-origin';
-import {
-  IconSize,
-  ValidTag,
-  Text,
-} from '../../../../components/component-library';
+import { Box, IconSize, Text } from '../../../../components/component-library';
 import {
   FlexDirection,
   TextVariant,
@@ -19,6 +13,7 @@ import {
   FontWeight,
   BlockSize,
   OverflowWrap,
+  BackgroundColor,
 } from '../../../../helpers/constants/design-system';
 import { PageContainerFooter } from '../../../../components/ui/page-container';
 import SnapConnectCell from '../../../../components/app/snaps/snap-connect-cell/snap-connect-cell';
@@ -38,7 +33,7 @@ export default function SnapsConnect({
   setSnapsInstallPrivacyWarningShownStatus,
 }) {
   const t = useI18nContext();
-  const { origin, iconUrl, name } = targetSubjectMetadata;
+  const { origin } = targetSubjectMetadata;
   const [isLoading, setIsLoading] = useState(false);
   const [isShowingSnapsPrivacyWarning, setIsShowingSnapsPrivacyWarning] =
     useState(!snapsInstallPrivacyWarningShown);
@@ -72,10 +67,12 @@ export default function SnapsConnect({
     if (isLoading) {
       return (
         <Box
-          className="snap-connect__loader-container"
+          display={Display.Flex}
           flexDirection={FlexDirection.Column}
           alignItems={AlignItems.center}
           justifyContent={JustifyContent.center}
+          width={BlockSize.Full}
+          height={BlockSize.Full}
         >
           <PulseLoader />
         </Box>
@@ -85,23 +82,25 @@ export default function SnapsConnect({
     if (snaps?.length > 1) {
       return (
         <Box
-          className="snaps-connect__content"
           flexDirection={FlexDirection.Column}
           justifyContent={JustifyContent.center}
           alignItems={AlignItems.center}
-          paddingLeft={4}
-          paddingRight={4}
-          paddingTop={8}
+          paddingTop={4}
           width={BlockSize.Full}
           style={{ overflowY: 'hidden' }}
+          backgroundColor={BackgroundColor.backgroundAlternative}
         >
-          <Text paddingBottom={2} variant={TextVariant.headingLg}>
+          <Text
+            paddingBottom={2}
+            variant={TextVariant.headingMd}
+            textAlign={TextAlign.Center}
+          >
             {t('connectionRequest')}
           </Text>
           <Text variant={TextVariant.bodyMd} textAlign={TextAlign.Center}>
             {t('multipleSnapConnectionWarning', [
               <Text
-                as={ValidTag.Span}
+                as="span"
                 key="1"
                 variant={TextVariant.bodyMd}
                 fontWeight={FontWeight.Medium}
@@ -109,7 +108,7 @@ export default function SnapsConnect({
                 {trimmedOrigin}
               </Text>,
               <Text
-                as={ValidTag.Span}
+                as="span"
                 key="2"
                 variant={TextVariant.bodyMd}
                 fontWeight={FontWeight.Medium}
@@ -119,7 +118,6 @@ export default function SnapsConnect({
             ])}
           </Text>
           <Box
-            className="snaps-connect__content__snaps-list"
             flexDirection={FlexDirection.Column}
             display={Display.Flex}
             marginTop={4}
@@ -140,13 +138,15 @@ export default function SnapsConnect({
     } else if (snaps?.length === 1) {
       return (
         <Box
-          className="snaps-connect__content"
+          display={Display.Flex}
           flexDirection={FlexDirection.Column}
           justifyContent={JustifyContent.center}
           alignItems={AlignItems.center}
+          width={BlockSize.Full}
           height={BlockSize.Full}
           paddingLeft={4}
           paddingRight={4}
+          backgroundColor={BackgroundColor.backgroundAlternative}
         >
           <Box paddingBottom={2}>
             <SnapAvatar
@@ -156,7 +156,7 @@ export default function SnapsConnect({
               borderWidth={3}
             />
           </Box>
-          <Text paddingBottom={2} variant={TextVariant.headingLg}>
+          <Text paddingBottom={2} variant={TextVariant.headingMd}>
             {t('connectionRequest')}
           </Text>
           <Text
@@ -167,7 +167,7 @@ export default function SnapsConnect({
           >
             {t('snapConnectionWarning', [
               <Text
-                as={ValidTag.Span}
+                as="span"
                 key="1"
                 variant={TextVariant.bodyMd}
                 fontWeight={FontWeight.Medium}
@@ -175,7 +175,7 @@ export default function SnapsConnect({
                 {trimmedOrigin}
               </Text>,
               <Text
-                as={ValidTag.Span}
+                as="span"
                 key="2"
                 variant={TextVariant.bodyMd}
                 fontWeight={FontWeight.Medium}
@@ -192,9 +192,13 @@ export default function SnapsConnect({
 
   return (
     <Box
-      className="page-container snaps-connect"
+      className="snaps-connect"
+      display={Display.Flex}
       flexDirection={FlexDirection.Column}
       alignItems={AlignItems.center}
+      height={BlockSize.Full}
+      width={BlockSize.Full}
+      backgroundColor={BackgroundColor.backgroundAlternative}
     >
       {isShowingSnapsPrivacyWarning && (
         <SnapPrivacyWarning
@@ -206,23 +210,15 @@ export default function SnapsConnect({
         />
       )}
       <Box
-        className="snaps-connect__header"
-        flexDirection={FlexDirection.Column}
-        alignItems={AlignItems.center}
+        display={Display.Flex}
+        height={BlockSize.Full}
+        width={BlockSize.Full}
         paddingLeft={4}
         paddingRight={4}
       >
-        <SiteOrigin
-          chip
-          siteOrigin={origin}
-          title={origin}
-          iconSrc={iconUrl}
-          iconName={name}
-        />
+        <SnapsConnectContent />
       </Box>
-      <SnapsConnectContent />
       <PageContainerFooter
-        footerClassName="snaps-connect__footer"
         cancelButtonType="default"
         hideCancel={false}
         disabled={isLoading}
diff --git a/ui/pages/remove-snap-account/snap-account-card.tsx b/ui/pages/remove-snap-account/snap-account-card.tsx
index 9d031c2ffb85..aaef89c844ca 100644
--- a/ui/pages/remove-snap-account/snap-account-card.tsx
+++ b/ui/pages/remove-snap-account/snap-account-card.tsx
@@ -21,8 +21,9 @@ export const SnapAccountCard = ({
   const internalAccounts = useSelector(getInternalAccounts);
   // We should stop using mergeAccounts and write a new selector instead
   const mergedAccounts = mergeAccounts(accounts, internalAccounts);
-  const identity = mergedAccounts.find(
-    (account: { address: string }) => account.address === address,
+  const account = mergedAccounts.find(
+    (internalAccount: { address: string }) =>
+      internalAccount.address === address,
   );
 
   return (
@@ -36,7 +37,7 @@ export const SnapAccountCard = ({
         boxShadow: 'var(--shadow-size-lg) var(--color-shadow-default)',
       }}
     >
-      <AccountListItem identity={identity} selected={remove} />
+      <AccountListItem account={account} selected={remove} />
     </Box>
   );
 };
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 1ab110fcf66b..9cbc1bf55d73 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -126,9 +126,11 @@ import { ThemeType } from '../../../shared/constants/preferences';
 import {
   AvatarAccount,
   AvatarAccountSize,
+  AvatarNetwork,
   Box,
 } from '../../components/component-library';
 import { ToggleIpfsModal } from '../../components/app/nft-default-image/toggle-ipfs-modal';
+import { BasicConfigurationModal } from '../../components/app/basic-configuration-modal';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import KeyringSnapRemovalResult from '../../components/app/modals/keyring-snap-removal-modal';
 ///: END:ONLY_INCLUDE_IF
@@ -138,6 +140,15 @@ import { DeprecatedNetworkModal } from '../settings/deprecated-network-modal/Dep
 import { getURLHost } from '../../helpers/utils/util';
 import { BorderColor } from '../../helpers/constants/design-system';
 import { MILLISECOND } from '../../../shared/constants/time';
+import { MultichainMetaFoxLogo } from '../../components/multichain/app-header/multichain-meta-fox-logo';
+
+const isConfirmTransactionRoute = (pathname) =>
+  Boolean(
+    matchPath(pathname, {
+      path: CONFIRM_TRANSACTION_ROUTE,
+      exact: false,
+    }),
+  );
 
 export default class Routes extends Component {
   static propTypes = {
@@ -183,12 +194,22 @@ export default class Routes extends Component {
     isImportNftsModalOpen: PropTypes.bool.isRequired,
     hideImportNftsModal: PropTypes.func.isRequired,
     isIpfsModalOpen: PropTypes.bool.isRequired,
+    isBasicConfigurationModalOpen: PropTypes.bool.isRequired,
     hideIpfsModal: PropTypes.func.isRequired,
     isImportTokensModalOpen: PropTypes.bool.isRequired,
     hideImportTokensModal: PropTypes.func.isRequired,
     isDeprecatedNetworkModalOpen: PropTypes.bool.isRequired,
     hideDeprecatedNetworkModal: PropTypes.func.isRequired,
     addPermittedAccount: PropTypes.func.isRequired,
+    switchedNetworkDetails: PropTypes.object,
+    clearSwitchedNetworkDetails: PropTypes.func.isRequired,
+    setSwitchedNetworkNeverShowMessage: PropTypes.func.isRequired,
+    networkToAutomaticallySwitchTo: PropTypes.object,
+    neverShowSwitchedNetworkMessage: PropTypes.bool.isRequired,
+    automaticallySwitchNetwork: PropTypes.func.isRequired,
+    unapprovedTransactions: PropTypes.number.isRequired,
+    currentExtensionPopupId: PropTypes.number,
+    useRequestQueue: PropTypes.bool,
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     isShowKeyringSnapRemovalResultModal: PropTypes.bool.isRequired,
     hideShowKeyringSnapRemovalResultModal: PropTypes.func.isRequired,
@@ -238,8 +259,16 @@ export default class Routes extends Component {
   ///: END:ONLY_INCLUDE_IF
 
   componentDidUpdate(prevProps) {
-    const { theme, account } = this.props;
-
+    const {
+      theme,
+      account,
+      networkToAutomaticallySwitchTo,
+      activeTabOrigin,
+      unapprovedTransactions,
+      isUnlocked,
+      useRequestQueue,
+      currentExtensionPopupId,
+    } = this.props;
     if (theme !== prevProps.theme) {
       this.setTheme();
     }
@@ -247,6 +276,33 @@ export default class Routes extends Component {
     if (prevProps.account?.address !== account?.address) {
       this.setState({ hideConnectAccountToast: false });
     }
+
+    // Automatically switch the network if the user
+    // no longer has unapprovedTransactions and they
+    // should be on a different network for the
+    // currently active tab's dapp
+    if (
+      networkToAutomaticallySwitchTo &&
+      unapprovedTransactions === 0 &&
+      (prevProps.unapprovedTransactions > 0 ||
+        (prevProps.isUnlocked === false && isUnlocked))
+    ) {
+      this.props.automaticallySwitchNetwork(
+        networkToAutomaticallySwitchTo,
+        activeTabOrigin,
+      );
+    }
+
+    // Terminate the popup when another popup is opened
+    // if the user is using RPC queueing
+    if (
+      useRequestQueue &&
+      currentExtensionPopupId !== undefined &&
+      global.metamask.id !== undefined &&
+      currentExtensionPopupId !== global.metamask.id
+    ) {
+      window.close();
+    }
   }
 
   UNSAFE_componentWillMount() {
@@ -401,15 +457,11 @@ export default class Routes extends Component {
           />
           ///: END:ONLY_INCLUDE_IF
         }
-        {process.env.MULTICHAIN && (
-          <Authenticated
-            path={`${CONNECTIONS}/:origin`}
-            component={Connections}
-          />
-        )}
-        {process.env.MULTICHAIN && (
-          <Authenticated path={PERMISSIONS} component={PermissionsPage} exact />
-        )}
+        <Authenticated
+          path={`${CONNECTIONS}/:origin`}
+          component={Connections}
+        />
+        <Authenticated path={PERMISSIONS} component={PermissionsPage} exact />
         <Authenticated path={DEFAULT_ROUTE} component={Home} />
       </Switch>
     );
@@ -467,6 +519,11 @@ export default class Routes extends Component {
     );
   }
 
+  onHomeScreen() {
+    const { location } = this.props;
+    return location.pathname === DEFAULT_ROUTE;
+  }
+
   hideAppHeader() {
     const { location } = this.props;
 
@@ -550,7 +607,11 @@ export default class Routes extends Component {
       }),
     );
 
-    return isHandlingPermissionsRequest || isHandlingAddEthereumChainRequest;
+    return (
+      isHandlingPermissionsRequest ||
+      isHandlingAddEthereumChainRequest ||
+      isConfirmTransactionRoute(this.pathname)
+    );
   }
 
   showOnboardingHeader() {
@@ -602,10 +663,15 @@ export default class Routes extends Component {
       isImportNftsModalOpen,
       hideImportNftsModal,
       isIpfsModalOpen,
+      isBasicConfigurationModalOpen,
       hideIpfsModal,
       hideImportTokensModal,
       hideDeprecatedNetworkModal,
       addPermittedAccount,
+      switchedNetworkDetails,
+      clearSwitchedNetworkDetails,
+      setSwitchedNetworkNeverShowMessage,
+      neverShowSwitchedNetworkMessage,
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       isShowKeyringSnapRemovalResultModal,
       hideShowKeyringSnapRemovalResultModal,
@@ -631,7 +697,8 @@ export default class Routes extends Component {
       !isNetworkUsed &&
       !isCurrentProviderCustom &&
       completedOnboarding &&
-      allAccountsOnNetworkAreEmpty;
+      allAccountsOnNetworkAreEmpty &&
+      switchedNetworkDetails === null;
 
     const windowType = getEnvironmentType();
 
@@ -653,6 +720,9 @@ export default class Routes extends Component {
       );
     ///: END:ONLY_INCLUDE_IF
 
+    const showAutoNetworkSwitchToast =
+      switchedNetworkDetails && !neverShowSwitchedNetworkMessage;
+
     return (
       <div
         className={classnames('app', {
@@ -660,6 +730,11 @@ export default class Routes extends Component {
           [`browser-${browser}`]: browser,
         })}
         dir={textDirection}
+        onMouseUp={
+          showAutoNetworkSwitchToast
+            ? () => clearSwitchedNetworkDetails()
+            : undefined
+        }
       >
         {shouldShowNetworkDeprecationWarning ? <DeprecatedNetworks /> : null}
         {shouldShowNetworkInfo && <NewNetworkInfo />}
@@ -667,6 +742,7 @@ export default class Routes extends Component {
         <Modal />
         <Alert visible={this.props.alertOpen} msg={alertMessage} />
         {!this.hideAppHeader() && <AppHeader location={location} />}
+        {isConfirmTransactionRoute(this.pathname) && <MultichainMetaFoxLogo />}
         {this.showOnboardingHeader() && <OnboardingAppHeader />}
         {
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -688,6 +764,7 @@ export default class Routes extends Component {
         {isIpfsModalOpen ? (
           <ToggleIpfsModal onClose={() => hideIpfsModal()} />
         ) : null}
+        {isBasicConfigurationModalOpen ? <BasicConfigurationModal /> : null}
         {isImportTokensModalOpen ? (
           <ImportTokensModal onClose={() => hideImportTokensModal()} />
         ) : null}
@@ -715,8 +792,11 @@ export default class Routes extends Component {
         </Box>
         {isUnlocked ? <Alerts history={this.props.history} /> : null}
         <ToastContainer>
-          {showConnectAccountToast && !this.state.hideConnectAccountToast ? (
+          {showConnectAccountToast &&
+          this.onHomeScreen() &&
+          !this.state.hideConnectAccountToast ? (
             <Toast
+              key="connect-account-toast"
               startAdornment={
                 <AvatarAccount
                   address={account.address}
@@ -747,6 +827,26 @@ export default class Routes extends Component {
               onClose={() => this.setState({ hideConnectAccountToast: true })}
             />
           ) : null}
+          {showAutoNetworkSwitchToast ? (
+            <Toast
+              key="switched-network-toast"
+              startAdornment={
+                <AvatarNetwork
+                  size={AvatarAccountSize.Md}
+                  borderColor={BorderColor.transparent}
+                  src={switchedNetworkDetails?.imageUrl}
+                  name={switchedNetworkDetails?.nickname}
+                />
+              }
+              text={this.context.t('switchedNetworkToastMessage', [
+                switchedNetworkDetails.nickname,
+                getURLHost(switchedNetworkDetails.origin),
+              ])}
+              actionText={this.context.t('switchedNetworkToastDecline')}
+              onActionClick={() => setSwitchedNetworkNeverShowMessage()}
+              onClose={() => clearSwitchedNetworkDetails()}
+            />
+          ) : null}
         </ToastContainer>
       </div>
     );
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index 3895eca7a742..16d649decf93 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -18,7 +18,13 @@ import {
   getShowExtensionInFullSizeView,
   getSelectedAccount,
   getPermittedAccountsForCurrentTab,
+  getSwitchedNetworkDetails,
+  getNeverShowSwitchedNetworkMessage,
+  getNetworkToAutomaticallySwitchTo,
+  getNumberOfAllUnapprovedTransactionsAndMessages,
+  getUseRequestQueue,
 } from '../../selectors';
+import { getSmartTransactionsOptInStatus } from '../../../shared/modules/selectors';
 import {
   lockMetamask,
   hideImportNftsModal,
@@ -30,6 +36,9 @@ import {
   hideImportTokensModal,
   hideDeprecatedNetworkModal,
   addPermittedAccount,
+  automaticallySwitchNetwork,
+  clearSwitchedNetworkDetails,
+  neverShowSwitchedNetworkMessage,
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   hideKeyringRemovalResultModal,
   ///: END:ONLY_INCLUDE_IF
@@ -38,6 +47,7 @@ import { pageChanged } from '../../ducks/history/history';
 import { prepareToLeaveSwaps } from '../../ducks/swaps/swaps';
 import { getSendStage } from '../../ducks/send';
 import {
+  getAlertEnabledness,
   getIsUnlocked,
   getProviderConfig,
 } from '../../ducks/metamask/metamask';
@@ -53,17 +63,22 @@ function mapStateToProps(state) {
 
   // If there is more than one connected account to activeTabOrigin,
   // *BUT* the current account is not one of them, show the banner
+  const allowShowAccountSetting = getAlertEnabledness(state).unconnectedAccount;
   const account = getSelectedAccount(state);
   const activeTabOrigin = activeTab?.origin;
   const connectedAccounts = getPermittedAccountsForCurrentTab(state);
   const showConnectAccountToast = Boolean(
-    process.env.MULTICHAIN &&
+    allowShowAccountSetting &&
       account &&
       activeTabOrigin &&
       connectedAccounts.length > 0 &&
       !connectedAccounts.find((address) => address === account.address),
   );
 
+  const networkToAutomaticallySwitchTo =
+    getNetworkToAutomaticallySwitchTo(state);
+  const switchedNetworkDetails = getSwitchedNetworkDetails(state);
+
   return {
     alertOpen,
     alertMessage,
@@ -87,6 +102,7 @@ function mapStateToProps(state) {
     allAccountsOnNetworkAreEmpty: getAllAccountsOnNetworkAreEmpty(state),
     isTestNet: getIsTestnet(state),
     showExtensionInFullSizeView: getShowExtensionInFullSizeView(state),
+    smartTransactionsOptInStatus: getSmartTransactionsOptInStatus(state),
     currentChainId: getCurrentChainId(state),
     shouldShowSeedPhraseReminder: getShouldShowSeedPhraseReminder(state),
     forgottenPassword: state.metamask.forgottenPassword,
@@ -95,10 +111,18 @@ function mapStateToProps(state) {
     isAccountMenuOpen: state.metamask.isAccountMenuOpen,
     isNetworkMenuOpen: state.metamask.isNetworkMenuOpen,
     isImportTokensModalOpen: state.appState.importTokensModalOpen,
+    isBasicConfigurationModalOpen: state.appState.showBasicFunctionalityModal,
     isDeprecatedNetworkModalOpen: state.appState.deprecatedNetworkModalOpen,
     accountDetailsAddress: state.appState.accountDetailsAddress,
     isImportNftsModalOpen: state.appState.importNftsModal.open,
     isIpfsModalOpen: state.appState.showIpfsModalOpen,
+    switchedNetworkDetails,
+    networkToAutomaticallySwitchTo,
+    unapprovedTransactions:
+      getNumberOfAllUnapprovedTransactionsAndMessages(state),
+    neverShowSwitchedNetworkMessage: getNeverShowSwitchedNetworkMessage(state),
+    currentExtensionPopupId: state.metamask.currentExtensionPopupId,
+    useRequestQueue: getUseRequestQueue(state),
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     isShowKeyringSnapRemovalResultModal:
       state.appState.showKeyringRemovalSnapModal,
@@ -122,6 +146,11 @@ function mapDispatchToProps(dispatch) {
     hideDeprecatedNetworkModal: () => dispatch(hideDeprecatedNetworkModal()),
     addPermittedAccount: (activeTabOrigin, address) =>
       dispatch(addPermittedAccount(activeTabOrigin, address)),
+    clearSwitchedNetworkDetails: () => dispatch(clearSwitchedNetworkDetails()),
+    setSwitchedNetworkNeverShowMessage: () =>
+      dispatch(neverShowSwitchedNetworkMessage()),
+    automaticallySwitchNetwork: (networkId, selectedTabOrigin) =>
+      dispatch(automaticallySwitchNetwork(networkId, selectedTabOrigin)),
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     hideShowKeyringSnapRemovalResultModal: () =>
       dispatch(hideKeyringRemovalResultModal()),
diff --git a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
index c5792a4df6a1..4e8b864812fc 100644
--- a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
+++ b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
@@ -65,6 +65,86 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      data-testid="advanced-setting-enable-smart-transactions"
+    >
+      <div
+        class="settings-page__content-item"
+      >
+        <span>
+          Smart Transactions
+        </span>
+        <div
+          class="settings-page__content-description"
+        >
+          <span>
+             
+            Turn on Smart Transactions for more reliable and secure transactions on ETH Mainnet. 
+            <a
+              class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+              href="https://support.metamask.io/transactions-and-gas/transactions/smart-transactions/"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              Learn more
+            </a>
+            
+             
+          </span>
+        </div>
+      </div>
+      <div
+        class="settings-page__content-item-col"
+      >
+        <label
+          class="toggle-button toggle-button--off"
+          tabindex="0"
+        >
+          <div
+            style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
+          >
+            <div
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
+            >
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
+              />
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 1;"
+              />
+            </div>
+            <div
+              style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
+            >
+              <div
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
+              />
+            </div>
+            <input
+              data-testid="settings-page-stx-opt-in-toggle"
+              style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
+              type="checkbox"
+              value="false"
+            />
+          </div>
+          <div
+            class="toggle-button__status"
+          >
+            <span
+              class="toggle-button__label-off"
+            >
+              Off
+            </span>
+            <span
+              class="toggle-button__label-on"
+            >
+              On
+            </span>
+          </div>
+        </label>
+      </div>
+    </div>
     <div
       class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
       data-testid="advanced-setting-hex-data"
@@ -92,7 +172,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -105,7 +185,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -158,7 +238,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -171,7 +251,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -224,7 +304,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -237,7 +317,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
               />
             </div>
             <input
@@ -290,7 +370,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -303,7 +383,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -356,7 +436,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -369,7 +449,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -542,7 +622,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -555,7 +635,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -608,7 +688,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -621,7 +701,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 027189aff37e..33e0443d4570 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -5,10 +5,13 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../../shared/constants/preferences';
+import { SMART_TRANSACTIONS_LEARN_MORE_URL } from '../../../../shared/constants/smartTransactions';
 import {
   BannerAlert,
   BannerAlertSeverity,
   Box,
+  ButtonLink,
+  ButtonLinkSize,
 } from '../../../components/component-library';
 import Button from '../../../components/ui/button';
 import TextField from '../../../components/ui/text-field';
@@ -19,6 +22,7 @@ import {
   JustifyContent,
   Severity,
   TextVariant,
+  AlignItems,
 } from '../../../helpers/constants/design-system';
 import {
   ExportableContentType,
@@ -48,12 +52,12 @@ export default class AdvancedTab extends PureComponent {
     sendHexData: PropTypes.bool,
     showFiatInTestnets: PropTypes.bool,
     showTestNetworks: PropTypes.bool,
-    showExtensionInFullSizeView: PropTypes.bool,
+    smartTransactionsOptInStatus: PropTypes.bool,
     autoLockTimeLimit: PropTypes.number,
     setAutoLockTimeLimit: PropTypes.func.isRequired,
     setShowFiatConversionOnTestnetsPreference: PropTypes.func.isRequired,
     setShowTestNetworks: PropTypes.func.isRequired,
-    setShowExtensionInFullSizeView: PropTypes.func.isRequired,
+    setSmartTransactionsOptInStatus: PropTypes.func.isRequired,
     setDismissSeedBackUpReminder: PropTypes.func.isRequired,
     dismissSeedBackUpReminder: PropTypes.bool.isRequired,
     backupUserData: PropTypes.func.isRequired,
@@ -62,6 +66,8 @@ export default class AdvancedTab extends PureComponent {
     disabledRpcMethodPreferences: PropTypes.shape({
       eth_sign: PropTypes.bool.isRequired,
     }),
+    showExtensionInFullSizeView: PropTypes.bool,
+    setShowExtensionInFullSizeView: PropTypes.func.isRequired,
   };
 
   state = {
@@ -238,13 +244,67 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
+  renderToggleStxOptIn() {
+    const { t } = this.context;
+    const { smartTransactionsOptInStatus, setSmartTransactionsOptInStatus } =
+      this.props;
+
+    const learMoreLink = (
+      <ButtonLink
+        size={ButtonLinkSize.Inherit}
+        textProps={{
+          variant: TextVariant.bodyMd,
+          alignItems: AlignItems.flexStart,
+        }}
+        as="a"
+        href={SMART_TRANSACTIONS_LEARN_MORE_URL}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {t('learnMoreUpperCase')}
+      </ButtonLink>
+    );
+
+    return (
+      <Box
+        ref={this.settingsRefs[2]}
+        className="settings-page__content-row"
+        data-testid="advanced-setting-enable-smart-transactions"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div className="settings-page__content-item">
+          <span>{t('smartTransactions')}</span>
+          <div className="settings-page__content-description">
+            {t('stxOptInDescription', [learMoreLink])}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            value={smartTransactionsOptInStatus}
+            onToggle={(oldValue) => {
+              const newValue = !oldValue;
+              setSmartTransactionsOptInStatus(newValue);
+            }}
+            offLabel={t('off')}
+            onLabel={t('on')}
+            dataTestId="settings-page-stx-opt-in-toggle"
+          />
+        </div>
+      </Box>
+    );
+  }
+
   renderHexDataOptIn() {
     const { t } = this.context;
     const { sendHexData, setHexDataFeatureFlag } = this.props;
 
     return (
       <Box
-        ref={this.settingsRefs[2]}
+        ref={this.settingsRefs[3]}
         className="settings-page__content-row"
         display={Display.Flex}
         flexDirection={FlexDirection.Row}
@@ -277,7 +337,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[3]}
+        ref={this.settingsRefs[4]}
         className="settings-page__content-row"
         display={Display.Flex}
         flexDirection={FlexDirection.Row}
@@ -312,7 +372,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[4]}
+        ref={this.settingsRefs[5]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-testnet-conversion"
         display={Display.Flex}
@@ -346,7 +406,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[7]}
+        ref={this.settingsRefs[8]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-extension-in-full-size-view"
         display={Display.Flex}
@@ -379,7 +439,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[5]}
+        ref={this.settingsRefs[6]}
         className="settings-page__content-row"
         data-testid="advanced-setting-custom-nonce"
         display={Display.Flex}
@@ -413,7 +473,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[6]}
+        ref={this.settingsRefs[7]}
         className="settings-page__content-row"
         data-testid="advanced-setting-auto-lock"
         display={Display.Flex}
@@ -462,7 +522,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[8]}
+        ref={this.settingsRefs[9]}
         className="settings-page__content-row"
         data-testid="advanced-setting-dismiss-reminder"
         display={Display.Flex}
@@ -509,7 +569,7 @@ export default class AdvancedTab extends PureComponent {
     };
     return (
       <Box
-        ref={this.settingsRefs[9]}
+        ref={this.settingsRefs[10]}
         className="settings-page__content-row"
         data-testid="advanced-setting-toggle-ethsign"
         display={Display.Flex}
@@ -589,7 +649,7 @@ export default class AdvancedTab extends PureComponent {
     const { t } = this.context;
     return (
       <Box
-        ref={this.settingsRefs[10]}
+        ref={this.settingsRefs[11]}
         className="settings-page__content-row"
         data-testid="advanced-setting-data-backup"
         display={Display.Flex}
@@ -631,7 +691,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <Box
-        ref={this.settingsRefs[11]}
+        ref={this.settingsRefs[12]}
         className="settings-page__content-row"
         data-testid="advanced-setting-data-restore"
         display={Display.Flex}
@@ -694,6 +754,7 @@ export default class AdvancedTab extends PureComponent {
         {warning ? <div className="settings-tab__error">{warning}</div> : null}
         {this.renderStateLogs()}
         {this.renderResetAccount()}
+        {this.renderToggleStxOptIn()}
         {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 ff59b7f83cf9..c50a32a7bd26 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -8,11 +8,13 @@ import AdvancedTab from '.';
 
 const mockSetAutoLockTimeLimit = jest.fn();
 const mockSetShowTestNetworks = jest.fn();
+const mockSetStxOptIn = jest.fn();
 
 jest.mock('../../../store/actions.ts', () => {
   return {
     setAutoLockTimeLimit: () => mockSetAutoLockTimeLimit,
     setShowTestNetworks: () => mockSetShowTestNetworks,
+    setSmartTransactionsOptInStatus: () => mockSetStxOptIn,
   };
 });
 
@@ -61,7 +63,7 @@ describe('AdvancedTab Component', () => {
   it('should toggle show test networks', () => {
     const { queryAllByRole } = renderWithProvider(<AdvancedTab />, mockStore);
 
-    const testNetworkToggle = queryAllByRole('checkbox')[2];
+    const testNetworkToggle = queryAllByRole('checkbox')[3];
 
     fireEvent.click(testNetworkToggle);
 
@@ -84,4 +86,19 @@ describe('AdvancedTab Component', () => {
 
     expect(queryByTestId('ledger-live-control')).not.toBeInTheDocument();
   });
+
+  describe('renderToggleStxOptIn', () => {
+    it('should render the toggle button for Smart Transactions', () => {
+      const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+      const toggleButton = queryByTestId('settings-page-stx-opt-in-toggle');
+      expect(toggleButton).toBeInTheDocument();
+    });
+
+    it('should call setSmartTransactionsOptInStatus when the toggle button is clicked', () => {
+      const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+      const toggleButton = queryByTestId('settings-page-stx-opt-in-toggle');
+      fireEvent.click(toggleButton);
+      expect(mockSetStxOptIn).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index e89b71557856..a0dcd4a7bcc3 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -14,6 +14,7 @@ import {
   setShowExtensionInFullSizeView,
   setShowFiatConversionOnTestnetsPreference,
   setShowTestNetworks,
+  setSmartTransactionsOptInStatus,
   setUseNonceField,
   showModal,
 } from '../../../store/actions';
@@ -34,6 +35,7 @@ export const mapStateToProps = (state) => {
     showFiatInTestnets,
     showTestNetworks,
     showExtensionInFullSizeView,
+    smartTransactionsOptInStatus,
     autoLockTimeLimit = DEFAULT_AUTO_LOCK_TIME_LIMIT,
   } = getPreferences(state);
 
@@ -43,6 +45,7 @@ export const mapStateToProps = (state) => {
     showFiatInTestnets,
     showTestNetworks,
     showExtensionInFullSizeView,
+    smartTransactionsOptInStatus,
     autoLockTimeLimit,
     useNonceField,
     dismissSeedBackUpReminder,
@@ -70,6 +73,9 @@ export const mapDispatchToProps = (dispatch) => {
     setShowExtensionInFullSizeView: (value) => {
       return dispatch(setShowExtensionInFullSizeView(value));
     },
+    setSmartTransactionsOptInStatus: (value) => {
+      return dispatch(setSmartTransactionsOptInStatus(value));
+    },
     setAutoLockTimeLimit: (value) => {
       return dispatch(setAutoLockTimeLimit(value));
     },
diff --git a/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
new file mode 100644
index 000000000000..6a4f848e3264
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
@@ -0,0 +1,173 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Develop options tab should match snapshot 1`] = `
+<div>
+  <div
+    class="settings-page__body"
+  >
+    <p
+      class="mm-box mm-text settings-page__security-tab-sub-header__bold mm-text--body-md mm-box--color-text-default"
+    >
+      States
+    </p>
+    <p
+      class="mm-box mm-text settings-page__security-tab-sub-header mm-text--body-md mm-box--padding-top-6 mm-box--color-text-alternative"
+    >
+      Reset States
+    </p>
+    <div
+      class="settings-page__content-padded"
+    >
+      <div
+        class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      >
+        <div
+          class="settings-page__content-item"
+        >
+          <span>
+            Announcements
+          </span>
+          <div
+            class="settings-page__content-description"
+          >
+            Resets isShown boolean to false for all announcements. Announcements are the notifications shown in the What's New popup modal.
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+          >
+            Reset
+          </button>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <div
+            class="mm-box mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--align-items-center"
+            style="height: 40px; width: 40px;"
+          >
+            <span
+              class="mm-box settings-page-developer-options__icon-check mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-success-default"
+              hidden=""
+              style="mask-image: url('./images/icons/check.svg');"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      >
+        <div
+          class="settings-page__content-item"
+          style="flex: 1 1 auto;"
+        >
+          <span>
+            Onboarding
+          </span>
+          <div
+            class="settings-page__content-description"
+          >
+            Resets various states related to onboarding and redirects to the "Secure Your Wallet" onboarding page.
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+          >
+            Reset
+          </button>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <div
+            class="mm-box mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--align-items-center"
+            style="height: 40px; width: 40px;"
+          >
+            <span
+              class="mm-box settings-page-developer-options__icon-check mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-success-default"
+              hidden=""
+              style="mask-image: url('./images/icons/check.svg');"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      >
+        <div
+          class="settings-page__content-item"
+        >
+          <div
+            class="settings-page__content-description"
+          >
+            <span>
+              Service Worker Keep Alive
+            </span>
+            <div
+              class="settings-page__content-description"
+            >
+              Results in a timestamp being continuously saved to session.storage
+            </div>
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <label
+            class="toggle-button toggle-button--on"
+            tabindex="0"
+          >
+            <div
+              style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
+            >
+              <div
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
+              >
+                <div
+                  style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
+                />
+                <div
+                  style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 0;"
+                />
+              </div>
+              <div
+                style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
+              >
+                <div
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
+                />
+              </div>
+              <input
+                data-testid="developer-options-service-worker-alive-toggle"
+                style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
+                type="checkbox"
+                value="true"
+              />
+            </div>
+            <div
+              class="toggle-button__status"
+            >
+              <span
+                class="toggle-button__label-off"
+              >
+                Off
+              </span>
+              <span
+                class="toggle-button__label-on"
+              >
+                On
+              </span>
+            </div>
+          </label>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/settings/developer-options-tab/developer-options-tab.stories.tsx b/ui/pages/settings/developer-options-tab/developer-options-tab.stories.tsx
new file mode 100644
index 000000000000..ee0bfb0a96a7
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/developer-options-tab.stories.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import DeveloperOptionsTab from './index';
+
+const DeveloperOptionsTabStory = {
+  title: 'Pages/Settings/DeveloperOptionsTab',
+
+  component: DeveloperOptionsTab,
+};
+
+export const DefaultStory = ({ variant, address }) => (
+  <DeveloperOptionsTab />
+);
+
+DefaultStory.storyName = 'Default';
+
+export default DeveloperOptionsTabStory;
diff --git a/ui/pages/settings/developer-options-tab/developer-options-tab.test.tsx b/ui/pages/settings/developer-options-tab/developer-options-tab.test.tsx
new file mode 100644
index 000000000000..d23be4777bda
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/developer-options-tab.test.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest/rendering';
+import mockState from '../../../../test/data/mock-state.json';
+import DeveloperOptionsTab from '.';
+
+const mockSetServiceWorkerKeepAlivePreference = jest.fn();
+
+jest.mock('../../../store/actions.ts', () => ({
+  setServiceWorkerKeepAlivePreference: () =>
+    mockSetServiceWorkerKeepAlivePreference,
+}));
+
+describe('Develop options tab', () => {
+  const mockStore = configureMockStore([thunk])(mockState);
+
+  it('should match snapshot', () => {
+    const { container } = renderWithProvider(
+      <DeveloperOptionsTab />,
+      mockStore,
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should toggle Service Worker Keep Alive', async () => {
+    const { getByTestId } = renderWithProvider(
+      <DeveloperOptionsTab />,
+      mockStore,
+    );
+    const triggerButton = getByTestId(
+      'developer-options-service-worker-alive-toggle',
+    );
+    expect(triggerButton).toBeInTheDocument();
+    fireEvent.click(triggerButton);
+
+    expect(mockSetServiceWorkerKeepAlivePreference).toHaveBeenCalled();
+  });
+});
diff --git a/ui/pages/settings/developer-options-tab/developer-options-tab.tsx b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
new file mode 100644
index 000000000000..f145ec785924
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
@@ -0,0 +1,238 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+
+import {
+  Box,
+  Button,
+  ButtonVariant,
+  Icon,
+  IconName,
+  IconSize,
+  Text,
+} from '../../../components/component-library';
+import {
+  IconColor,
+  TextColor,
+  Display,
+  FlexDirection,
+  JustifyContent,
+  AlignItems,
+} from '../../../helpers/constants/design-system';
+import ToggleButton from '../../../components/ui/toggle-button';
+import { ONBOARDING_SECURE_YOUR_WALLET_ROUTE } from '../../../helpers/constants/routes';
+import {
+  getNumberOfSettingRoutesInTab,
+  handleSettingsRefs,
+} from '../../../helpers/utils/settings-search';
+
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  resetOnboarding,
+  resetViewedNotifications,
+  setServiceWorkerKeepAlivePreference,
+} from '../../../store/actions';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
+
+const DeveloperOptionsTab = () => {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const history = useHistory();
+
+  const [hasResetAnnouncements, setHasResetAnnouncements] = useState(false);
+  const [hasResetOnboarding, setHasResetOnboarding] = useState(false);
+  const [isServiceWorkerKeptAlive, setIsServiceWorkerKeptAlive] =
+    useState(true);
+
+  const settingsRefs = Array(
+    getNumberOfSettingRoutesInTab(t, t('developerOptions')),
+  )
+    .fill(undefined)
+    .map(() => {
+      return React.createRef();
+    });
+
+  useEffect(() => {
+    handleSettingsRefs(t, t('developerOptions'), settingsRefs);
+  }, [t, settingsRefs]);
+
+  const handleResetAnnouncementClick = useCallback((): void => {
+    resetViewedNotifications();
+    setHasResetAnnouncements(true);
+  }, []);
+
+  const handleResetOnboardingClick = useCallback(async (): Promise<void> => {
+    await dispatch(resetOnboarding());
+    setHasResetOnboarding(true);
+
+    const backUpSRPRoute = `${ONBOARDING_SECURE_YOUR_WALLET_ROUTE}/?isFromReminder=true`;
+    const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
+
+    if (isPopup) {
+      const { platform } = global;
+      if (platform?.openExtensionInBrowser) {
+        platform?.openExtensionInBrowser(backUpSRPRoute, null, true);
+      }
+    } else {
+      history.push(backUpSRPRoute);
+    }
+  }, [dispatch, history]);
+
+  const handleToggleServiceWorkerAlive = async (
+    value: boolean,
+  ): Promise<void> => {
+    await dispatch(setServiceWorkerKeepAlivePreference(value));
+    setIsServiceWorkerKeptAlive(value);
+  };
+
+  const renderAnnouncementReset = () => {
+    return (
+      <Box
+        ref={settingsRefs[1] as React.RefObject<HTMLDivElement>}
+        className="settings-page__content-row"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div className="settings-page__content-item">
+          <span>{t('announcements')}</span>
+          <div className="settings-page__content-description">
+            {t('developerOptionsResetStatesAnnouncementsDescription')}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <Button
+            variant={ButtonVariant.Primary}
+            onClick={handleResetAnnouncementClick}
+          >
+            {t('reset')}
+          </Button>
+        </div>
+        <div className="settings-page__content-item-col">
+          <Box
+            display={Display.Flex}
+            alignItems={AlignItems.center}
+            paddingLeft={2}
+            paddingRight={2}
+            style={{ height: '40px', width: '40px' }}
+          >
+            <Icon
+              className="settings-page-developer-options__icon-check"
+              name={IconName.Check}
+              color={IconColor.successDefault}
+              size={IconSize.Lg}
+              hidden={!hasResetAnnouncements}
+            />
+          </Box>
+        </div>
+      </Box>
+    );
+  };
+
+  const renderOnboardingReset = () => {
+    return (
+      <Box
+        ref={settingsRefs[2] as React.RefObject<HTMLDivElement>}
+        className="settings-page__content-row"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div
+          className="settings-page__content-item"
+          style={{ flex: '1 1 auto' }}
+        >
+          <span>{t('onboarding')}</span>
+          <div className="settings-page__content-description">
+            {t('developerOptionsResetStatesOnboarding')}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <Button
+            variant={ButtonVariant.Primary}
+            onClick={handleResetOnboardingClick}
+          >
+            {t('reset')}
+          </Button>
+        </div>
+        <div className="settings-page__content-item-col">
+          <Box
+            display={Display.Flex}
+            alignItems={AlignItems.center}
+            paddingLeft={2}
+            paddingRight={2}
+            style={{ height: '40px', width: '40px' }}
+          >
+            <Icon
+              className="settings-page-developer-options__icon-check"
+              name={IconName.Check}
+              color={IconColor.successDefault}
+              size={IconSize.Lg}
+              hidden={!hasResetOnboarding}
+            />
+          </Box>
+        </div>
+      </Box>
+    );
+  };
+
+  const renderServiceWorkerKeepAliveToggle = () => {
+    return (
+      <Box
+        ref={settingsRefs[3] as React.RefObject<HTMLDivElement>}
+        className="settings-page__content-row"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div className="settings-page__content-item">
+          <div className="settings-page__content-description">
+            <span>{t('serviceWorkerKeepAlive')}</span>
+            <div className="settings-page__content-description">
+              {t('developerOptionsServiceWorkerKeepAlive')}
+            </div>
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            value={isServiceWorkerKeptAlive}
+            onToggle={(value) => handleToggleServiceWorkerAlive(!value)}
+            offLabel={t('off')}
+            onLabel={t('on')}
+            dataTestId="developer-options-service-worker-alive-toggle"
+          />
+        </div>
+      </Box>
+    );
+  };
+  return (
+    <div className="settings-page__body">
+      <Text className="settings-page__security-tab-sub-header__bold">
+        {t('states')}
+      </Text>
+      <Text
+        className="settings-page__security-tab-sub-header"
+        color={TextColor.textAlternative}
+        paddingTop={6}
+        ref={settingsRefs[0] as React.RefObject<HTMLDivElement>}
+      >
+        {t('resetStates')}
+      </Text>
+
+      <div className="settings-page__content-padded">
+        {renderAnnouncementReset()}
+        {renderOnboardingReset()}
+        {renderServiceWorkerKeepAliveToggle()}
+      </div>
+    </div>
+  );
+};
+
+export default DeveloperOptionsTab;
diff --git a/ui/pages/settings/developer-options-tab/index.scss b/ui/pages/settings/developer-options-tab/index.scss
new file mode 100644
index 000000000000..c7ac3890bf55
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/index.scss
@@ -0,0 +1,10 @@
+.settings-page-developer-options {
+  &__icon-check {
+    transition: opacity 0.3s ease-in-out;
+    opacity: 0;
+
+    &:not([hidden]) {
+      opacity: 1;
+    }
+  }
+}
diff --git a/ui/pages/settings/developer-options-tab/index.tsx b/ui/pages/settings/developer-options-tab/index.tsx
new file mode 100644
index 000000000000..c3014579a848
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/index.tsx
@@ -0,0 +1 @@
+export { default } from './developer-options-tab';
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 41da90d1d264..99985867f2cb 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
@@ -31,7 +31,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -44,7 +44,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
@@ -71,6 +71,72 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
         </label>
       </div>
     </div>
+    <div
+      class="mm-box settings-page__content-row settings-page__content-row-experimental"
+    >
+      <div
+        class="settings-page__content-item"
+      >
+        <span>
+          Improved signature requests
+        </span>
+        <div
+          class="settings-page__content-description"
+        >
+          Turn this on to see signature requests in an enhanced format.
+        </div>
+      </div>
+      <div
+        class="settings-page__content-item-col"
+      >
+        <label
+          class="toggle-button toggle-button--off redesigned-confirmations-toggle"
+          tabindex="0"
+        >
+          <div
+            style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
+          >
+            <div
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
+            >
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
+              />
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 1;"
+              />
+            </div>
+            <div
+              style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
+            >
+              <div
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
+              />
+            </div>
+            <input
+              data-testid="toggle-redesigned-confirmations"
+              style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
+              type="checkbox"
+              value="false"
+            />
+          </div>
+          <div
+            class="toggle-button__status"
+          >
+            <span
+              class="toggle-button__label-off"
+            >
+              Off
+            </span>
+            <span
+              class="toggle-button__label-on"
+            >
+              On
+            </span>
+          </div>
+        </label>
+      </div>
+    </div>
     <h4
       class="mm-box mm-text mm-text--heading-sm mm-text--font-weight-bold mm-box--margin-bottom-2 mm-box--color-text-alternative"
     >
@@ -112,7 +178,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
                   style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
                 >
                   <div
-                    style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                    style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
                   >
                     <div
                       style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -125,7 +191,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
                     style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                   >
                     <div
-                      style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                      style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                     />
                   </div>
                   <input
@@ -207,7 +273,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -220,7 +286,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
               style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
             >
               <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
               />
             </div>
             <input
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
index 330979df6979..839bdf04e40f 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -54,6 +54,10 @@ export default class ExperimentalTab extends PureComponent {
     setUseRequestQueue: PropTypes.func,
     petnamesEnabled: PropTypes.bool.isRequired,
     setPetnamesEnabled: PropTypes.func.isRequired,
+    featureNotificationsEnabled: PropTypes.bool,
+    setFeatureNotificationsEnabled: PropTypes.func,
+    redesignedConfirmationsEnabled: PropTypes.bool.isRequired,
+    setRedesignedConfirmationsEnabled: PropTypes.func.isRequired,
   };
 
   settingsRefs = Array(
@@ -107,6 +111,39 @@ export default class ExperimentalTab extends PureComponent {
     );
   }
 
+  renderToggleRedesignedConfirmations() {
+    const { t } = this.context;
+    const {
+      redesignedConfirmationsEnabled,
+      setRedesignedConfirmationsEnabled,
+    } = this.props;
+
+    return (
+      <Box
+        ref={this.settingsRefs[0]}
+        className="settings-page__content-row settings-page__content-row-experimental"
+      >
+        <div className="settings-page__content-item">
+          <span>{t('redesignedConfirmationsEnabledToggle')}</span>
+          <div className="settings-page__content-description">
+            {t('redesignedConfirmationsToggleDescription')}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            className="redesigned-confirmations-toggle"
+            value={redesignedConfirmationsEnabled}
+            onToggle={(value) => setRedesignedConfirmationsEnabled(!value)}
+            offLabel={t('off')}
+            onLabel={t('on')}
+            dataTestId="toggle-redesigned-confirmations"
+          />
+        </div>
+      </Box>
+    );
+  }
+
   ///: BEGIN:ONLY_INCLUDE_IF(desktop)
   renderDesktopEnableButton() {
     const { t } = this.context;
@@ -245,10 +282,41 @@ export default class ExperimentalTab extends PureComponent {
     );
   }
 
+  renderNotificationsToggle() {
+    const { t } = this.context;
+    const { featureNotificationsEnabled, setFeatureNotificationsEnabled } =
+      this.props;
+    return (
+      <Box
+        ref={this.settingsRefs[0]}
+        className="settings-page__content-row settings-page__content-row-experimental"
+      >
+        <div className="settings-page__content-item">
+          <span>{t('notificationsFeatureToggle')}</span>
+          <div className="settings-page__content-description">
+            {t('notificationsFeatureToggleDescription')}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            value={featureNotificationsEnabled}
+            onToggle={(value) => setFeatureNotificationsEnabled(!value)}
+            offLabel={t('off')}
+            onLabel={t('on')}
+            dataTestId="toggle-notifications"
+          />
+        </div>
+      </Box>
+    );
+  }
+
   render() {
     return (
       <div className="settings-page__body">
         {this.renderTogglePetnames()}
+        {this.renderToggleRedesignedConfirmations()}
+        {process.env.NOTIFICATIONS ? this.renderNotificationsToggle() : null}
         {
           ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
           this.renderKeyringSnapsToggle()
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.container.js b/ui/pages/settings/experimental-tab/experimental-tab.container.js
index 2db176c537db..f6f23dcecc2e 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.container.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.container.js
@@ -7,6 +7,8 @@ import {
   ///: END:ONLY_INCLUDE_IF
   setUseRequestQueue,
   setPetnamesEnabled,
+  setFeatureNotificationsEnabled,
+  setRedesignedConfirmationsEnabled,
 } from '../../../store/actions';
 import {
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
@@ -14,17 +16,22 @@ import {
   ///: END:ONLY_INCLUDE_IF
   getUseRequestQueue,
   getPetnamesEnabled,
+  getFeatureNotificationsEnabled,
+  getRedesignedConfirmationsEnabled,
 } from '../../../selectors';
 import ExperimentalTab from './experimental-tab.component';
 
 const mapStateToProps = (state) => {
   const petnamesEnabled = getPetnamesEnabled(state);
+  const featureNotificationsEnabled = getFeatureNotificationsEnabled(state);
   return {
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     addSnapAccountEnabled: getIsAddSnapAccountEnabled(state),
     ///: END:ONLY_INCLUDE_IF
     useRequestQueue: getUseRequestQueue(state),
     petnamesEnabled,
+    featureNotificationsEnabled,
+    redesignedConfirmationsEnabled: getRedesignedConfirmationsEnabled(state),
   };
 };
 
@@ -37,6 +44,11 @@ const mapDispatchToProps = (dispatch) => {
     setPetnamesEnabled: (value) => {
       return dispatch(setPetnamesEnabled(value));
     },
+    setFeatureNotificationsEnabled: (value) => {
+      return dispatch(setFeatureNotificationsEnabled(value));
+    },
+    setRedesignedConfirmationsEnabled: (value) =>
+      dispatch(setRedesignedConfirmationsEnabled(value)),
   };
 };
 
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.test.js b/ui/pages/settings/experimental-tab/experimental-tab.test.js
index 10c2e4745c01..d021412f4d2a 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.test.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.test.js
@@ -37,7 +37,7 @@ describe('ExperimentalTab', () => {
     const { getAllByRole } = render({ desktopEnabled: true });
     const toggle = getAllByRole('checkbox');
 
-    expect(toggle).toHaveLength(3);
+    expect(toggle).toHaveLength(4);
   });
 
   it('should enable add account snap', async () => {
@@ -79,4 +79,22 @@ describe('ExperimentalTab', () => {
       expect(setPetnamesEnabled).toHaveBeenCalledWith(false);
     });
   });
+
+  it('should enable redesigned confirmations', async () => {
+    const setRedesignedConfirmationsEnabled = jest.fn();
+    const { getByTestId } = render(
+      { desktopEnabled: true },
+      {
+        setRedesignedConfirmationsEnabled,
+        redesignedConfirmationsEnabled: false,
+      },
+    );
+
+    const toggle = getByTestId('toggle-redesigned-confirmations');
+    fireEvent.click(toggle);
+
+    await waitFor(() => {
+      expect(setRedesignedConfirmationsEnabled).toHaveBeenCalledWith(true);
+    });
+  });
 });
diff --git a/ui/pages/settings/index.scss b/ui/pages/settings/index.scss
index 77153dab0f21..053675326c7f 100644
--- a/ui/pages/settings/index.scss
+++ b/ui/pages/settings/index.scss
@@ -2,6 +2,7 @@
 
 @import 'info-tab/index';
 @import 'alerts-tab/alerts-tab';
+@import 'developer-options-tab/index';
 @import 'networks-tab/index';
 @import 'settings-tab/index';
 @import 'contact-list-tab/index';
@@ -267,6 +268,10 @@
 
   &__content-row {
     padding: 10px 0 20px;
+
+    @include design-system.screen-sm-max {
+      flex-wrap: wrap;
+    }
   }
 
   &__content-item {
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 64faf2642cf7..b5a072ac3312 100644
--- a/ui/pages/settings/networks-tab/networks-form/networks-form.js
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.js
@@ -19,6 +19,7 @@ import {
 import {
   BUILT_IN_NETWORKS,
   CHAIN_IDS,
+  CHAINLIST_CURRENCY_SYMBOLS_MAP_NETWORK_COLLISION,
   FEATURED_RPCS,
   infuraProjectId,
 } from '../../../../../shared/constants/network';
@@ -57,6 +58,10 @@ import {
   TextColor,
   TextVariant,
 } from '../../../../helpers/constants/design-system';
+import {
+  getMatchedChain,
+  getMatchedSymbols,
+} from '../../../../helpers/utils/network-helper';
 
 /**
  * Attempts to convert the given chainId to a decimal string, for display
@@ -102,6 +107,7 @@ const NetworksForm = ({
 }) => {
   const t = useI18nContext();
   const dispatch = useDispatch();
+  const DEFAULT_SUGGESTED_TICKER = [];
   const { label, labelKey, viewOnly, rpcPrefs } = selectedNetwork;
   const selectedNetworkName =
     label || (labelKey && t(getNetworkLabelKey(labelKey)));
@@ -109,7 +115,9 @@ const NetworksForm = ({
   const [rpcUrl, setRpcUrl] = useState(selectedNetwork?.rpcUrl || '');
   const [chainId, setChainId] = useState(selectedNetwork?.chainId || '');
   const [ticker, setTicker] = useState(selectedNetwork?.ticker || '');
-  const [suggestedTicker, setSuggestedTicker] = useState('');
+  const [suggestedTicker, setSuggestedTicker] = useState(
+    DEFAULT_SUGGESTED_TICKER,
+  );
   const [blockExplorerUrl, setBlockExplorerUrl] = useState(
     selectedNetwork?.blockExplorerUrl || '',
   );
@@ -145,7 +153,21 @@ const NetworksForm = ({
             chainList[index].nativeCurrency.symbol = network.ticker;
           }
         });
-        safeChainsList.current = chainList;
+        safeChainsList.current = [
+          ...chainList,
+          {
+            chainId: 78,
+            nativeCurrency: {
+              symbol: CHAINLIST_CURRENCY_SYMBOLS_MAP_NETWORK_COLLISION.WETHIO,
+            },
+          },
+          {
+            chainId: 88888,
+            nativeCurrency: {
+              symbol: CHAINLIST_CURRENCY_SYMBOLS_MAP_NETWORK_COLLISION.CHZ,
+            },
+          },
+        ];
       } catch (error) {
         log.warn('Failed to fetch chainList from chainid.network', error);
       }
@@ -163,7 +185,7 @@ const NetworksForm = ({
     setBlockExplorerUrl(selectedNetwork?.blockExplorerUrl);
     setErrors({});
     setWarnings({});
-    setSuggestedTicker('');
+    setSuggestedTicker([]);
     setIsSubmitting(false);
     setIsEditing(false);
     setPreviousNetwork(selectedNetwork);
@@ -261,18 +283,28 @@ const NetworksForm = ({
   const autoSuggestTicker = useCallback((formChainId) => {
     const decimalChainId = getDisplayChainId(formChainId);
     if (decimalChainId.trim() === '' || safeChainsList.current.length === 0) {
-      setSuggestedTicker('');
+      setSuggestedTicker([]);
       return;
     }
     const matchedChain = safeChainsList.current?.find(
       (chain) => chain.chainId.toString() === decimalChainId,
     );
+
+    const matchedSymbol = safeChainsList.current?.reduce(
+      (accumulator, currentNetwork) => {
+        if (currentNetwork.chainId.toString() === decimalChainId) {
+          accumulator.push(currentNetwork.nativeCurrency?.symbol);
+        }
+        return accumulator;
+      },
+      [],
+    );
+
     if (matchedChain === undefined) {
-      setSuggestedTicker('');
+      setSuggestedTicker([]);
       return;
     }
-    const returnedTickerSymbol = matchedChain.nativeCurrency?.symbol;
-    setSuggestedTicker(returnedTickerSymbol);
+    setSuggestedTicker([...matchedSymbol]);
   }, []);
 
   const hasErrors = () => {
@@ -442,23 +474,26 @@ const NetworksForm = ({
         warningKey = 'failedToFetchTickerSymbolData';
         warningMessage = t('failedToFetchTickerSymbolData');
       } else {
-        const matchedChain = safeChainsList.current?.find(
-          (chain) => chain.chainId.toString() === decimalChainId,
+        const matchedChain = getMatchedChain(
+          decimalChainId,
+          safeChainsList.current,
+        );
+        const matchedSymbols = getMatchedSymbols(
+          decimalChainId,
+          safeChainsList.current,
         );
 
         if (matchedChain === undefined) {
           warningKey = 'failedToFetchTickerSymbolData';
           warningMessage = t('failedToFetchTickerSymbolData');
-        } else {
-          const returnedTickerSymbol = matchedChain.nativeCurrency?.symbol;
-          if (
-            returnedTickerSymbol.toLowerCase() !==
-            formTickerSymbol.toLowerCase()
-          ) {
-            warningKey = 'chainListReturnedDifferentTickerSymbol';
-            warningMessage = t('chainListReturnedDifferentTickerSymbol');
-            setSuggestedTicker(returnedTickerSymbol);
-          }
+        } else if (
+          !matchedSymbols.some(
+            (symbol) => symbol.toLowerCase() === formTickerSymbol.toLowerCase(),
+          )
+        ) {
+          warningKey = 'chainListReturnedDifferentTickerSymbol';
+          warningMessage = t('chainListReturnedDifferentTickerSymbol');
+          setSuggestedTicker([...matchedSymbols]);
         }
       }
 
@@ -681,6 +716,12 @@ const NetworksForm = ({
     !rpcUrl ||
     !chainId ||
     !ticker;
+  let displayRpcUrl = rpcUrl?.includes(`/v3/${infuraProjectId}`)
+    ? rpcUrl.replace(`/v3/${infuraProjectId}`, '')
+    : rpcUrl;
+  if (viewOnly) {
+    displayRpcUrl = displayRpcUrl?.toLowerCase();
+  }
 
   return (
     <div
@@ -726,11 +767,7 @@ const NetworksForm = ({
             setRpcUrl(value);
           }}
           titleText={t('rpcUrl')}
-          value={
-            rpcUrl?.includes(`/v3/${infuraProjectId}`)
-              ? rpcUrl.replace(`/v3/${infuraProjectId}`, '')
-              : rpcUrl
-          }
+          value={displayRpcUrl}
           disabled={viewOnly}
           dataTestId="network-form-rpc-url"
         />
@@ -751,7 +788,10 @@ const NetworksForm = ({
         <FormTextField
           data-testid="network-form-ticker"
           helpText={
-            suggestedTicker && suggestedTicker !== ticker ? (
+            suggestedTicker &&
+            !suggestedTicker.some(
+              (symbolSuggested) => symbolSuggested === ticker,
+            ) ? (
               <Text
                 as="span"
                 variant={TextVariant.bodySm}
@@ -759,19 +799,22 @@ const NetworksForm = ({
                 data-testid="network-form-ticker-suggestion"
               >
                 {t('suggestedTokenSymbol')}
-                <ButtonLink
-                  as="button"
-                  variant={TextVariant.bodySm}
-                  color={TextColor.primaryDefault}
-                  onClick={() => {
-                    setTicker(suggestedTicker);
-                  }}
-                  paddingLeft={1}
-                  paddingRight={1}
-                  style={{ verticalAlign: 'baseline' }}
-                >
-                  {suggestedTicker}
-                </ButtonLink>
+                {suggestedTicker.map((suggestedSymbol, i) => (
+                  <ButtonLink
+                    as="button"
+                    variant={TextVariant.bodySm}
+                    color={TextColor.primaryDefault}
+                    onClick={() => {
+                      setTicker(suggestedSymbol);
+                    }}
+                    paddingLeft={1}
+                    paddingRight={1}
+                    style={{ verticalAlign: 'baseline' }}
+                    key={i}
+                  >
+                    {suggestedSymbol}
+                  </ButtonLink>
+                ))}
               </Text>
             ) : null
           }
diff --git a/ui/pages/settings/networks-tab/networks-form/networks-form.test.js b/ui/pages/settings/networks-tab/networks-form/networks-form.test.js
index 5bd701a36e51..a491dee64184 100644
--- a/ui/pages/settings/networks-tab/networks-form/networks-form.test.js
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.test.js
@@ -195,6 +195,24 @@ describe('NetworkForm Component', () => {
     ).toBeInTheDocument();
   });
 
+  it('should convert rpcUrl field to lowercase when not in input mode', async () => {
+    const networkDisplay = {
+      ...propNetworkDisplay,
+      selectedNetwork: {
+        ...propNetworkDisplay.suggestedNetwork,
+        rpcUrl: 'http://LOCALHOST:8545',
+        viewOnly: true,
+      },
+    };
+    const { getByDisplayValue } = renderComponent(networkDisplay);
+
+    expect(
+      getByDisplayValue(
+        propNetworkDisplay.selectedNetwork.rpcUrl.toLowerCase(),
+      ),
+    ).toBeInTheDocument();
+  });
+
   it('should validate chain id field correctly', async () => {
     renderComponent(propNewNetwork);
     const chainIdField = screen.getByRole('textbox', { name: 'Chain ID' });
@@ -337,4 +355,60 @@ describe('NetworkForm Component', () => {
       await screen.findByTestId('network-form-ticker-warning'),
     ).not.toBeInTheDocument();
   });
+
+  it('should validate currency symbol field for ZYN network', async () => {
+    const safeChainsList = [
+      {
+        chainId: 78,
+        nativeCurrency: {
+          symbol: 'PETH',
+        },
+      },
+    ];
+
+    // Mock the fetchWithCache function to return the safeChainsList
+    jest
+      .spyOn(fetchWithCacheModule, 'default')
+      .mockResolvedValue(safeChainsList);
+
+    renderComponent(propNewNetwork);
+
+    const chainIdField = screen.getByRole('textbox', { name: 'Chain ID' });
+    const currencySymbolField = screen.getByTestId('network-form-ticker-input');
+
+    fireEvent.change(chainIdField, {
+      target: { value: '78' },
+    });
+
+    fireEvent.change(currencySymbolField, {
+      target: { value: 'ZYN' },
+    });
+
+    expect(
+      await screen.queryByTestId('network-form-ticker-suggestion'),
+    ).not.toBeInTheDocument();
+
+    fireEvent.change(currencySymbolField, {
+      target: { value: 'ETH' },
+    });
+
+    expect(
+      await screen.queryByTestId('network-form-ticker-suggestion'),
+    ).toBeInTheDocument();
+
+    const expectedSymbolWarning = 'Suggested ticker symbol:';
+    expect(await screen.findByText(expectedSymbolWarning)).toBeInTheDocument();
+
+    fireEvent.change(currencySymbolField, {
+      target: { value: 'PETH' },
+    });
+
+    expect(
+      await screen.queryByTestId('network-form-ticker-suggestion'),
+    ).not.toBeInTheDocument();
+
+    expect(
+      await screen.queryByText(expectedSymbolWarning),
+    ).not.toBeInTheDocument();
+  });
 });
diff --git a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
index b480730f796c..c23a1c6a4a3b 100644
--- a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
+++ b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
@@ -102,9 +102,7 @@ const NetworksListItem = ({
         )
       )}
       {network.isATestNetwork &&
-        ![CHAIN_IDS.LINEA_GOERLI, CHAIN_IDS.LINEA_SEPOLIA].includes(
-          network.chainId,
-        ) && (
+        ![CHAIN_IDS.LINEA_SEPOLIA].includes(network.chainId) && (
           <UrlIcon
             name={label || getNetworkLabelKey(labelKey)}
             fallbackClassName={classnames(
diff --git a/ui/pages/settings/networks-tab/networks-tab.constants.js b/ui/pages/settings/networks-tab/networks-tab.constants.js
index 95ed3018b6bc..8e61213bbb8e 100644
--- a/ui/pages/settings/networks-tab/networks-tab.constants.js
+++ b/ui/pages/settings/networks-tab/networks-tab.constants.js
@@ -9,7 +9,8 @@ import {
 const defaultNetworksData = [
   {
     labelKey: NETWORK_TYPES.MAINNET,
-    iconColor: '#29B6AF',
+    // eslint-disable-next-line @metamask/design-tokens/color-no-hex
+    iconColor: '#29B6AF', // third party color
     providerType: NETWORK_TYPES.MAINNET,
     rpcUrl: getRpcUrl({
       network: NETWORK_TYPES.MAINNET,
@@ -21,7 +22,8 @@ const defaultNetworksData = [
   },
   {
     labelKey: NETWORK_TYPES.SEPOLIA,
-    iconColor: '#CFB5F0',
+    // eslint-disable-next-line @metamask/design-tokens/color-no-hex
+    iconColor: '#CFB5F0', // third party color
     providerType: NETWORK_TYPES.SEPOLIA,
     rpcUrl: getRpcUrl({
       network: NETWORK_TYPES.SEPOLIA,
@@ -31,21 +33,10 @@ const defaultNetworksData = [
     ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
     blockExplorerUrl: 'https://sepolia.etherscan.io',
   },
-  {
-    labelKey: NETWORK_TYPES.LINEA_GOERLI,
-    iconColor: '#61dfff',
-    providerType: NETWORK_TYPES.LINEA_GOERLI,
-    rpcUrl: getRpcUrl({
-      network: NETWORK_TYPES.LINEA_GOERLI,
-      excludeProjectId: true,
-    }),
-    chainId: CHAIN_IDS.LINEA_GOERLI,
-    ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
-    blockExplorerUrl: 'https://goerli.lineascan.build',
-  },
   {
     labelKey: NETWORK_TYPES.LINEA_SEPOLIA,
-    iconColor: '#61dfff',
+    // eslint-disable-next-line @metamask/design-tokens/color-no-hex
+    iconColor: '#61dfff', // third party color
     providerType: NETWORK_TYPES.LINEA_SEPOLIA,
     rpcUrl: getRpcUrl({
       network: NETWORK_TYPES.LINEA_SEPOLIA,
@@ -57,7 +48,8 @@ const defaultNetworksData = [
   },
   {
     labelKey: NETWORK_TYPES.LINEA_MAINNET,
-    iconColor: '#121212',
+    // eslint-disable-next-line @metamask/design-tokens/color-no-hex
+    iconColor: '#121212', // third party color
     providerType: NETWORK_TYPES.LINEA_MAINNET,
     rpcUrl: getRpcUrl({
       network: NETWORK_TYPES.LINEA_MAINNET,
diff --git a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
index f38b2f9a7320..189ad690dde5 100644
--- a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
+++ b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
@@ -5,6 +5,72 @@ exports[`Security Tab should match snapshot 1`] = `
   <div
     class="settings-page__body"
   >
+    <div
+      class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      data-testid="advanced-setting-show-testnet-conversion"
+    >
+      <div
+        class="settings-page__content-item"
+      >
+        <span>
+          Basic functionality
+        </span>
+        <div
+          class="settings-page__content-description"
+        >
+          Includes token data and value, optimal gas settings, and more. Using these services shares your IP address with MetaMask, just like when you visit a website.
+        </div>
+      </div>
+      <div
+        class="settings-page__content-item-col"
+      >
+        <label
+          class="toggle-button toggle-button--off"
+          tabindex="0"
+        >
+          <div
+            style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
+          >
+            <div
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
+            >
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
+              />
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 1;"
+              />
+            </div>
+            <div
+              style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
+            >
+              <div
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
+              />
+            </div>
+            <input
+              style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
+              type="checkbox"
+              value="false"
+            />
+          </div>
+          <div
+            class="toggle-button__status"
+          >
+            <span
+              class="toggle-button__label-off"
+            >
+              Off
+            </span>
+            <span
+              class="toggle-button__label-on"
+            >
+              On
+            </span>
+          </div>
+        </label>
+      </div>
+    </div>
     <div
       class="settings-tab__error"
     >
@@ -31,10 +97,10 @@ exports[`Security Tab should match snapshot 1`] = `
         Reveal Secret Recovery Phrase
       </button>
     </div>
-    <div
-      class="settings-page__security-tab-sub-header"
-    >
-      <span>
+    <div>
+      <span
+        class="settings-page__security-tab-sub-header"
+      >
         Security alerts
       </span>
     </div>
@@ -77,7 +143,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -90,7 +156,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                 />
               </div>
               <input
@@ -159,7 +225,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -172,7 +238,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                 />
               </div>
               <input
@@ -236,7 +302,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -249,7 +315,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                 />
               </div>
               <input
@@ -339,7 +405,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -352,7 +418,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                 />
               </div>
               <input
@@ -439,7 +505,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -452,7 +518,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                   />
                 </div>
                 <input
@@ -526,7 +592,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -539,7 +605,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                   />
                 </div>
                 <input
@@ -609,7 +675,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -622,7 +688,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                   />
                 </div>
                 <input
@@ -692,94 +758,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
-                >
-                  <div
-                    style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
-                  />
-                  <div
-                    style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 0;"
-                  />
-                </div>
-                <div
-                  style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
-                >
-                  <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
-                  />
-                </div>
-                <input
-                  style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
-                  type="checkbox"
-                  value="true"
-                />
-              </div>
-              <div
-                class="toggle-button__status"
-              >
-                <span
-                  class="toggle-button__label-off"
-                >
-                  Off
-                </span>
-                <span
-                  class="toggle-button__label-on"
-                >
-                  On
-                </span>
-              </div>
-            </label>
-          </div>
-        </div>
-        <div
-          class="mm-box network-toggle-wrapper mm-box--margin-top-6 mm-box--margin-bottom-6 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
-          data-testid="network-toggle-0xe704"
-        >
-          <div
-            class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
-          >
-            <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
-            >
-              <img
-                alt="Linea Goerli logo"
-                class="mm-avatar-network__network-image"
-                src="./images/linea-logo-testnet.png"
-              />
-            </div>
-            <div
-              class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--flex-direction-column"
-            >
-              <p
-                class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-              >
-                Linea Goerli
-              </p>
-              <p
-                class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-primary-default mm-box--background-color-transparent"
-              >
-                <a
-                  href="https://lineascan.build"
-                  rel="noreferrer"
-                  target="_blank"
-                >
-                  Lineascan.build
-                </a>
-              </p>
-            </div>
-          </div>
-          <div
-            class="mm-box mm-box--margin-left-auto"
-          >
-            <label
-              class="toggle-button toggle-button--on"
-              tabindex="0"
-            >
-              <div
-                style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
-              >
-                <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -792,7 +771,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                   />
                 </div>
                 <input
@@ -866,7 +845,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -879,7 +858,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                   />
                 </div>
                 <input
@@ -945,7 +924,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -958,7 +937,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                 />
               </div>
               <input
@@ -1071,7 +1050,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1084,7 +1063,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                   />
                 </div>
                 <input
@@ -1142,7 +1121,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -1155,7 +1134,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                   />
                 </div>
                 <input
@@ -1256,7 +1235,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1269,7 +1248,7 @@ exports[`Security Tab should match snapshot 1`] = `
                   style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
                 >
                   <div
-                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                    style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                   />
                 </div>
                 <input
@@ -1346,7 +1325,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -1359,7 +1338,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                 />
               </div>
               <input
@@ -1412,7 +1391,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1425,7 +1404,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                 />
               </div>
               <input
@@ -1479,7 +1458,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -1492,7 +1471,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                 />
               </div>
               <input
@@ -1545,7 +1524,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(16, 152, 252);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 1; width: 26px; height: 20px; left: 4px;"
@@ -1558,7 +1537,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(3, 125, 214); left: 18px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 18px;"
                 />
               </div>
               <input
@@ -1622,7 +1601,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(242, 244, 246);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1635,7 +1614,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
                 <div
-                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: none; border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(106, 115, 125); left: 3px;"
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
                 />
               </div>
               <input
diff --git a/ui/pages/settings/security-tab/security-tab.component.js b/ui/pages/settings/security-tab/security-tab.component.js
index da4bbc2d88b3..8e9fd077b28d 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -82,10 +82,13 @@ export default class SecurityTab extends PureComponent {
     setUseAddressBarEnsResolution: PropTypes.func.isRequired,
     useExternalNameSources: PropTypes.bool.isRequired,
     setUseExternalNameSources: PropTypes.func.isRequired,
+    setBasicFunctionalityModalOpen: PropTypes.func.isRequired,
     setUseTransactionSimulations: PropTypes.func.isRequired,
     useTransactionSimulations: PropTypes.bool.isRequired,
     petnamesEnabled: PropTypes.bool.isRequired,
     securityAlertsEnabled: PropTypes.bool,
+    useExternalServices: PropTypes.bool,
+    toggleExternalServices: PropTypes.func.isRequired,
     ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
     setSecurityAlertsEnabled: PropTypes.func,
     ///: END:ONLY_INCLUDE_IF
@@ -187,16 +190,14 @@ export default class SecurityTab extends PureComponent {
 
   renderSecurityAlertsToggle() {
     const { t } = this.context;
-
     const { securityAlertsEnabled } = this.props;
 
     return (
       <>
-        <div
-          ref={this.settingsRefs[15]}
-          className="settings-page__security-tab-sub-header"
-        >
-          <span>{t('securityAlerts')}</span>
+        <div ref={this.settingsRefs[15]}>
+          <span className="settings-page__security-tab-sub-header">
+            {t('securityAlerts')}
+          </span>
         </div>
         <div className="settings-page__content-padded">
           <Box
@@ -980,11 +981,57 @@ export default class SecurityTab extends PureComponent {
   }
   ///: END:ONLY_INCLUDE_IF
 
+  renderUseExternalServices() {
+    const { t } = this.context;
+    const {
+      useExternalServices,
+      toggleExternalServices,
+      setBasicFunctionalityModalOpen,
+    } = this.props;
+
+    return (
+      <Box
+        ref={this.settingsRefs[3]}
+        className="settings-page__content-row"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+        data-testid="advanced-setting-show-testnet-conversion"
+      >
+        <div className="settings-page__content-item">
+          <span>{t('basicConfigurationLabel')}</span>
+          <div className="settings-page__content-description">
+            {t('basicConfigurationDescription')}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            value={useExternalServices}
+            onToggle={() => {
+              if (useExternalServices) {
+                // If we are going to be disabling external services, then we want to show the "turn off" warning modal
+                setBasicFunctionalityModalOpen();
+              } else {
+                toggleExternalServices(true);
+              }
+            }}
+            offLabel={t('off')}
+            onLabel={t('on')}
+          />
+        </div>
+      </Box>
+    );
+  }
+
   render() {
     const { warning, petnamesEnabled } = this.props;
 
     return (
       <div className="settings-page__body">
+        {this.renderUseExternalServices()}
+
         {warning && <div className="settings-tab__error">{warning}</div>}
         <span className="settings-page__security-tab-sub-header__bold">
           {this.context.t('security')}
diff --git a/ui/pages/settings/security-tab/security-tab.container.js b/ui/pages/settings/security-tab/security-tab.container.js
index 81cc1dcabc2d..f411e1ceb1f2 100644
--- a/ui/pages/settings/security-tab/security-tab.container.js
+++ b/ui/pages/settings/security-tab/security-tab.container.js
@@ -10,6 +10,7 @@ import {
   setUseMultiAccountBalanceChecker,
   setUsePhishDetect,
   setUseTokenDetection,
+  toggleExternalServices,
   setUseAddressBarEnsResolution,
   setOpenSeaEnabled,
   setUseNftDetection,
@@ -28,6 +29,7 @@ import {
   ///: END:ONLY_INCLUDE_IF
   getPetnamesEnabled,
 } from '../../../selectors';
+import { openBasicFunctionalityModal } from '../../../ducks/app/app';
 import SecurityTab from './security-tab.component';
 
 const mapStateToProps = (state) => {
@@ -51,6 +53,7 @@ const mapStateToProps = (state) => {
     openSeaEnabled,
     useNftDetection,
     use4ByteResolution,
+    useExternalServices,
     useExternalNameSources,
   } = metamask;
 
@@ -72,6 +75,7 @@ const mapStateToProps = (state) => {
     useNftDetection,
     use4ByteResolution,
     useExternalNameSources,
+    useExternalServices,
     petnamesEnabled,
     ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
     securityAlertsEnabled: getIsSecurityAlertsEnabled(state),
@@ -97,6 +101,8 @@ const mapDispatchToProps = (dispatch) => {
       dispatch(setUseAddressBarEnsResolution(val)),
     setUseSafeChainsListValidation: (val) =>
       dispatch(setUseSafeChainsListValidation(val)),
+    setBasicFunctionalityModalOpen: () =>
+      dispatch(openBasicFunctionalityModal()),
     setOpenSeaEnabled: (val) => dispatch(setOpenSeaEnabled(val)),
     setUseNftDetection: (val) => dispatch(setUseNftDetection(val)),
     setUse4ByteResolution: (value) => {
@@ -105,6 +111,9 @@ const mapDispatchToProps = (dispatch) => {
     setUseExternalNameSources: (value) => {
       return dispatch(setUseExternalNameSources(value));
     },
+    toggleExternalServices: (value) => {
+      return dispatch(toggleExternalServices(value));
+    },
     setUseTransactionSimulations: (value) => {
       return dispatch(setUseTransactionSimulations(value));
     },
diff --git a/ui/pages/settings/settings-tab/settings-tab.container.js b/ui/pages/settings/settings-tab/settings-tab.container.js
index 6b272b8f76e4..2f28d88e4bea 100644
--- a/ui/pages/settings/settings-tab/settings-tab.container.js
+++ b/ui/pages/settings/settings-tab/settings-tab.container.js
@@ -8,7 +8,12 @@ import {
   setParticipateInMetaMetrics,
   setTheme,
 } from '../../../store/actions';
-import { getTokenList, getPreferences, getTheme } from '../../../selectors';
+import {
+  getTokenList,
+  getPreferences,
+  getTheme,
+  getSelectedInternalAccount,
+} from '../../../selectors';
 import SettingsTab from './settings-tab.component';
 
 const mapStateToProps = (state, ownProps) => {
@@ -21,8 +26,8 @@ const mapStateToProps = (state, ownProps) => {
     providerConfig: { ticker: nativeCurrency },
     useBlockie,
     currentLocale,
-    selectedAddress,
   } = metamask;
+  const { address: selectedAddress } = getSelectedInternalAccount(state);
   const { useNativeCurrencyAsPrimaryCurrency, hideZeroBalanceTokens } =
     getPreferences(state);
 
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index cdbace048bd3..1f45681bdc01 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -16,6 +16,7 @@ import {
   CONTACT_ADD_ROUTE,
   CONTACT_EDIT_ROUTE,
   CONTACT_VIEW_ROUTE,
+  DEVELOPER_OPTIONS_ROUTE,
   EXPERIMENTAL_ROUTE,
   ADD_NETWORK_ROUTE,
   ADD_POPULAR_CUSTOM_NETWORK,
@@ -49,6 +50,7 @@ import AdvancedTab from './advanced-tab';
 import InfoTab from './info-tab';
 import SecurityTab from './security-tab';
 import ContactListTab from './contact-list-tab';
+import DeveloperOptionsTab from './developer-options-tab';
 import ExperimentalTab from './experimental-tab';
 import SettingsSearch from './settings-search';
 import SettingsSearchList from './settings-search-list';
@@ -291,6 +293,7 @@ class SettingsPage extends PureComponent {
   renderTabs() {
     const { history, currentPath } = this.props;
     const { t } = this.context;
+
     const tabs = [
       {
         content: t('general'),
@@ -334,6 +337,14 @@ class SettingsPage extends PureComponent {
       },
     ];
 
+    if (process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS) {
+      tabs.splice(-1, 0, {
+        content: t('developerOptions'),
+        icon: <Icon name={IconName.CodeCircle} />,
+        key: DEVELOPER_OPTIONS_ROUTE,
+      });
+    }
+
     return (
       <TabBar
         tabs={tabs}
@@ -387,6 +398,13 @@ class SettingsPage extends PureComponent {
         />
         <Route exact path={SECURITY_ROUTE} component={SecurityTab} />
         <Route exact path={EXPERIMENTAL_ROUTE} component={ExperimentalTab} />
+        {process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS && (
+          <Route
+            exact
+            path={DEVELOPER_OPTIONS_ROUTE}
+            component={DeveloperOptionsTab}
+          />
+        )}
         <Route exact path={CONTACT_LIST_ROUTE} component={ContactListTab} />
         <Route exact path={CONTACT_ADD_ROUTE} component={ContactListTab} />
         <Route
diff --git a/ui/pages/settings/settings.container.js b/ui/pages/settings/settings.container.js
index 88d38cfb2ccc..d8cb9a57141e 100644
--- a/ui/pages/settings/settings.container.js
+++ b/ui/pages/settings/settings.container.js
@@ -18,6 +18,7 @@ import {
   CONTACT_ADD_ROUTE,
   CONTACT_EDIT_ROUTE,
   CONTACT_VIEW_ROUTE,
+  DEVELOPER_OPTIONS_ROUTE,
   GENERAL_ROUTE,
   NETWORKS_FORM_ROUTE,
   NETWORKS_ROUTE,
@@ -39,6 +40,7 @@ const ROUTES_TO_I18N_KEYS = {
   [CONTACT_EDIT_ROUTE]: 'editContact',
   [CONTACT_LIST_ROUTE]: 'contacts',
   [CONTACT_VIEW_ROUTE]: 'viewContact',
+  [DEVELOPER_OPTIONS_ROUTE]: 'developerOptions',
   [EXPERIMENTAL_ROUTE]: 'experimental',
   [GENERAL_ROUTE]: 'general',
   [NETWORKS_FORM_ROUTE]: 'networks',
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap b/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
new file mode 100644
index 000000000000..4da9535d2e3e
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/__snapshots__/smart-transactions-status-page.test.js.snap
@@ -0,0 +1,485 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SmartTransactionStatusPage renders the "Sorry for the wait" pending status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top mm-box--margin-top-3"
+        />
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-primary-default"
+            style="mask-image: url('./images/icons/clock.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Sorry for the wait
+        </h4>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+        >
+          <div
+            class="smart-transaction-status-page__loading-bar-container"
+          >
+            <div
+              class="smart-transaction-status-page__loading-bar"
+              style="width: 100%;"
+            />
+          </div>
+        </div>
+        <div
+          class="mm-box smart-transaction-status-page__description mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            <span>
+               
+              If your transaction is not finalized within 
+              <p
+                class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
+              >
+                0:00
+              </p>
+              , it will be canceled and you will not be charged for gas.
+               
+            </span>
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom mm-box--margin-top-3"
+      />
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "cancelled" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top mm-box--margin-top-3"
+        />
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction was canceled
+        </h4>
+        <div
+          class="mm-box smart-transaction-status-page__description mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
+      </div>
+      <div
+        class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom mm-box--margin-top-3"
+      />
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "deadline_missed" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top mm-box--margin-top-3"
+        />
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction was canceled
+        </h4>
+        <div
+          class="mm-box smart-transaction-status-page__description mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
+      </div>
+      <div
+        class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom mm-box--margin-top-3"
+      />
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "reverted" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top mm-box--margin-top-3"
+        />
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction failed
+        </h4>
+        <div
+          class="mm-box smart-transaction-status-page__description mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
+      </div>
+      <div
+        class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom mm-box--margin-top-3"
+      />
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "success" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top mm-box--margin-top-3"
+        />
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/confirmation.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction is complete
+        </h4>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
+      </div>
+      <div
+        class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom mm-box--margin-top-3"
+      />
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the "unknown" STX status 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top mm-box--margin-top-3"
+        />
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/danger.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Your transaction failed
+        </h4>
+        <div
+          class="mm-box smart-transaction-status-page__description mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--margin-top-2 mm-box--display-flex mm-box--flex-direction-column"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+            type="link"
+          >
+            View  transaction
+          </button>
+        </div>
+      </div>
+      <div
+        class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom mm-box--margin-top-3"
+      />
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SmartTransactionStatusPage renders the component with initial props 1`] = `
+<div>
+  <div
+    class="mm-box smart-transaction-status-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
+  >
+    <div
+      class="mm-box mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--width-full"
+      style="flex-grow: 1;"
+    >
+      <div
+        class="mm-box mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+      >
+        <div
+          class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top mm-box--margin-top-3"
+        />
+        <div
+          class="mm-box mm-box--display-flex"
+          style="font-size: 48px;"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-inherit mm-box--margin-bottom-4 mm-box--display-inline-block mm-box--color-primary-default"
+            style="mask-image: url('./images/icons/clock.svg');"
+          />
+        </div>
+        <h4
+          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--color-text-default"
+        >
+          Submitting your transaction
+        </h4>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full"
+        >
+          <div
+            class="smart-transaction-status-page__loading-bar-container"
+          >
+            <div
+              class="smart-transaction-status-page__loading-bar"
+              style="width: 0%;"
+            />
+          </div>
+        </div>
+        <div
+          class="mm-box smart-transaction-status-page__description mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--color-text-alternative"
+          >
+            <span>
+               
+              Estimated completion in &lt; 
+              <p
+                class="mm-box mm-text smart-transaction-status-page__countdown mm-text--body-sm mm-text--text-align-center mm-box--display-inline-block mm-box--color-text-alternative"
+              >
+                0:45
+              </p>
+              
+               
+            </span>
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom mm-box--margin-top-3"
+      />
+    </div>
+    <div
+      class="mm-box smart-transaction-status-page__footer mm-box--padding-4 mm-box--padding-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md-medium mm-box--margin-top-3 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+        data-testid="smart-transaction-status-page-footer-close-button"
+      >
+        View activity
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/index.scss b/ui/pages/smart-transactions/smart-transaction-status-page/index.scss
new file mode 100644
index 000000000000..5e74ba9a8b3d
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/index.scss
@@ -0,0 +1,79 @@
+
+@keyframes shift {
+  to {
+    background-position: 100% 0;
+  }
+}
+
+.smart-transaction-status-page {
+  text-align: center;
+
+  @media screen and (min-width: 768px) {
+    max-width: 640px;
+    margin: auto auto 16px auto;
+    overflow: hidden;
+  }
+
+  &__description {
+    @media screen and (min-width: 768px) {
+      max-width: 480px;
+    }
+  }
+
+  &__loading-bar-container {
+    @media screen and (min-width: 768px) {
+      max-width: 260px;
+    }
+
+    width: 100%;
+    height: 3px;
+    background: var(--color-background-alternative);
+    display: flex;
+    margin-top: 16px;
+  }
+
+  &__loading-bar {
+    height: 3px;
+    background: var(--color-primary-default);
+    transition: width 0.5s linear;
+  }
+
+  &__footer {
+    grid-area: footer;
+  }
+
+  &__countdown {
+    width: 25px;
+  }
+
+  // Slightly overwrite the default SimulationDetails layout to look better on the Smart Transaction status page.
+  .simulation-details-layout {
+    margin-left: 0;
+    margin-right: 0;
+    width: 100%;
+    text-align: left;
+  }
+
+  &__background-animation {
+    position: relative;
+    left: -88px;
+    background-repeat: repeat;
+    background-position: 0 0;
+
+    &--top {
+      width: 1634px;
+      height: 54px;
+      background-size: 817px 54px;
+      background-image: url('/images/transaction-background-top.svg');
+      animation: shift 19s linear infinite;
+    }
+
+    &--bottom {
+      width: 1600px;
+      height: 62px;
+      background-size: 800px 62px;
+      background-image: url('/images/transaction-background-bottom.svg');
+      animation: shift 22s linear infinite;
+    }
+  }
+}
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/index.ts b/ui/pages/smart-transactions/smart-transaction-status-page/index.ts
new file mode 100644
index 000000000000..9fc47833935e
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/index.ts
@@ -0,0 +1 @@
+export { default as SmartTransactionStatusPage } from './smart-transaction-status-page';
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
new file mode 100644
index 000000000000..ef9b1efcb647
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
@@ -0,0 +1,543 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import {
+  SmartTransactionStatuses,
+  SmartTransaction,
+} from '@metamask/smart-transactions-controller/dist/types';
+
+import {
+  Box,
+  Text,
+  Icon,
+  IconName,
+  IconSize,
+  Button,
+  ButtonVariant,
+  ButtonSecondary,
+} from '../../../components/component-library';
+import {
+  AlignItems,
+  BlockSize,
+  BorderStyle,
+  Display,
+  FlexDirection,
+  JustifyContent,
+  TextVariant,
+  TextColor,
+  FontWeight,
+  IconColor,
+  TextAlign,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getCurrentChainId, getFullTxData } from '../../../selectors';
+import { getFeatureFlagsByChainId } from '../../../../shared/modules/selectors';
+import { BaseUrl } from '../../../../shared/constants/urls';
+import {
+  FALLBACK_SMART_TRANSACTIONS_EXPECTED_DEADLINE,
+  FALLBACK_SMART_TRANSACTIONS_MAX_DEADLINE,
+} from '../../../../shared/constants/smartTransactions';
+import { hideLoadingIndication } from '../../../store/actions';
+import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
+import { SimulationDetails } from '../../confirmations/components/simulation-details';
+import { NOTIFICATION_WIDTH } from '../../../../shared/constants/notifications';
+
+type RequestState = {
+  smartTransaction?: SmartTransaction;
+  isDapp: boolean;
+  txId?: string;
+};
+
+export type SmartTransactionStatusPageProps = {
+  requestState: RequestState;
+  onCloseExtension: () => void;
+  onViewActivity: () => void;
+};
+
+export const showRemainingTimeInMinAndSec = (
+  remainingTimeInSec: number,
+): string => {
+  if (!Number.isInteger(remainingTimeInSec)) {
+    return '0:00';
+  }
+  const minutes = Math.floor(remainingTimeInSec / 60);
+  const seconds = remainingTimeInSec % 60;
+  return `${minutes}:${seconds.toString().padStart(2, '0')}`;
+};
+
+const getDisplayValues = ({
+  t,
+  countdown,
+  isSmartTransactionPending,
+  isSmartTransactionTakingTooLong,
+  isSmartTransactionSuccess,
+  isSmartTransactionCancelled,
+}: {
+  t: ReturnType<typeof useI18nContext>;
+  countdown: JSX.Element | undefined;
+  isSmartTransactionPending: boolean;
+  isSmartTransactionTakingTooLong: boolean;
+  isSmartTransactionSuccess: boolean;
+  isSmartTransactionCancelled: boolean;
+}) => {
+  if (isSmartTransactionPending && isSmartTransactionTakingTooLong) {
+    return {
+      title: t('smartTransactionTakingTooLong'),
+      description: t('smartTransactionTakingTooLongDescription', [countdown]),
+      iconName: IconName.Clock,
+      iconColor: IconColor.primaryDefault,
+    };
+  } else if (isSmartTransactionPending) {
+    return {
+      title: t('smartTransactionPending'),
+      description: t('stxEstimatedCompletion', [countdown]),
+      iconName: IconName.Clock,
+      iconColor: IconColor.primaryDefault,
+    };
+  } else if (isSmartTransactionSuccess) {
+    return {
+      title: t('smartTransactionSuccess'),
+      iconName: IconName.Confirmation,
+      iconColor: IconColor.successDefault,
+    };
+  } else if (isSmartTransactionCancelled) {
+    return {
+      title: t('smartTransactionCancelled'),
+      description: t('smartTransactionCancelledDescription', [countdown]),
+      iconName: IconName.Danger,
+      iconColor: IconColor.errorDefault,
+    };
+  }
+  // E.g. reverted or unknown statuses.
+  return {
+    title: t('smartTransactionError'),
+    description: t('smartTransactionErrorDescription'),
+    iconName: IconName.Danger,
+    iconColor: IconColor.errorDefault,
+  };
+};
+
+const useRemainingTime = ({
+  isSmartTransactionPending,
+  smartTransaction,
+  stxMaxDeadline,
+  stxEstimatedDeadline,
+}: {
+  isSmartTransactionPending: boolean;
+  smartTransaction?: SmartTransaction;
+  stxMaxDeadline: number;
+  stxEstimatedDeadline: number;
+}) => {
+  const [timeLeftForPendingStxInSec, setTimeLeftForPendingStxInSec] =
+    useState(0);
+  const [isSmartTransactionTakingTooLong, setIsSmartTransactionTakingTooLong] =
+    useState(false);
+  const stxDeadline = isSmartTransactionTakingTooLong
+    ? stxMaxDeadline
+    : stxEstimatedDeadline;
+
+  useEffect(() => {
+    if (!isSmartTransactionPending) {
+      return;
+    }
+
+    const calculateRemainingTime = () => {
+      const secondsAfterStxSubmission = smartTransaction?.creationTime
+        ? Math.round((Date.now() - smartTransaction.creationTime) / 1000)
+        : 0;
+
+      if (secondsAfterStxSubmission > stxDeadline) {
+        setTimeLeftForPendingStxInSec(0);
+        if (!isSmartTransactionTakingTooLong) {
+          setIsSmartTransactionTakingTooLong(true);
+        }
+        return;
+      }
+
+      setTimeLeftForPendingStxInSec(stxDeadline - secondsAfterStxSubmission);
+    };
+
+    const intervalId = setInterval(calculateRemainingTime, 1000);
+    calculateRemainingTime();
+
+    // eslint-disable-next-line consistent-return
+    return () => clearInterval(intervalId);
+  }, [
+    isSmartTransactionPending,
+    isSmartTransactionTakingTooLong,
+    smartTransaction?.creationTime,
+    stxDeadline,
+  ]);
+
+  return {
+    timeLeftForPendingStxInSec,
+    isSmartTransactionTakingTooLong,
+    stxDeadline,
+  };
+};
+
+const Deadline = ({
+  isSmartTransactionPending,
+  stxDeadline,
+  timeLeftForPendingStxInSec,
+}: {
+  isSmartTransactionPending: boolean;
+  stxDeadline: number;
+  timeLeftForPendingStxInSec: number;
+}) => {
+  if (!isSmartTransactionPending) {
+    return null;
+  }
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      alignItems={AlignItems.center}
+      width={BlockSize.Full}
+    >
+      <div className="smart-transaction-status-page__loading-bar-container">
+        <div
+          className="smart-transaction-status-page__loading-bar"
+          style={{
+            width: `${
+              (100 / stxDeadline) * (stxDeadline - timeLeftForPendingStxInSec)
+            }%`,
+          }}
+        />
+      </div>
+    </Box>
+  );
+};
+
+const Description = ({ description }: { description: string | undefined }) => {
+  if (!description) {
+    return null;
+  }
+
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      alignItems={AlignItems.center}
+      className="smart-transaction-status-page__description"
+    >
+      <Text
+        marginTop={2}
+        color={TextColor.textAlternative}
+        variant={TextVariant.bodySm}
+      >
+        {description}
+      </Text>
+    </Box>
+  );
+};
+
+const PortfolioSmartTransactionStatusUrl = ({
+  portfolioSmartTransactionStatusUrl,
+  isSmartTransactionPending,
+  onCloseExtension,
+}: {
+  portfolioSmartTransactionStatusUrl?: string;
+  isSmartTransactionPending: boolean;
+  onCloseExtension: () => void;
+}) => {
+  if (!portfolioSmartTransactionStatusUrl) {
+    return null;
+  }
+
+  const handleViewTransactionLinkClick = useCallback(() => {
+    const isWiderThanNotificationWidth = window.innerWidth > NOTIFICATION_WIDTH;
+    if (!isSmartTransactionPending || isWiderThanNotificationWidth) {
+      onCloseExtension();
+    }
+    global.platform.openTab({
+      url: portfolioSmartTransactionStatusUrl,
+    });
+  }, [
+    isSmartTransactionPending,
+    onCloseExtension,
+    portfolioSmartTransactionStatusUrl,
+  ]);
+  const t = useI18nContext();
+
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      marginTop={2}
+    >
+      <Button
+        type="link"
+        variant={ButtonVariant.Link}
+        onClick={handleViewTransactionLinkClick}
+      >
+        {t('viewTransaction')}
+      </Button>
+    </Box>
+  );
+};
+
+const CloseExtensionButton = ({
+  isDapp,
+  isSmartTransactionPending,
+  onCloseExtension,
+}: {
+  isDapp: boolean;
+  isSmartTransactionPending: boolean;
+  onCloseExtension: () => void;
+}) => {
+  if (!isDapp || isSmartTransactionPending) {
+    return null;
+  }
+  const t = useI18nContext();
+
+  return (
+    <ButtonSecondary
+      data-testid="smart-transaction-status-page-footer-close-button"
+      onClick={onCloseExtension}
+      width={BlockSize.Full}
+      marginTop={3}
+    >
+      {t('closeExtension')}
+    </ButtonSecondary>
+  );
+};
+
+const ViewActivityButton = ({
+  isDapp,
+  onViewActivity,
+}: {
+  isDapp: boolean;
+  onViewActivity: () => void;
+}) => {
+  if (isDapp) {
+    return null;
+  }
+  const t = useI18nContext();
+
+  return (
+    <ButtonSecondary
+      data-testid="smart-transaction-status-page-footer-close-button"
+      onClick={onViewActivity}
+      width={BlockSize.Full}
+      marginTop={3}
+    >
+      {t('viewActivity')}
+    </ButtonSecondary>
+  );
+};
+
+const SmartTransactionsStatusPageFooter = ({
+  isDapp,
+  isSmartTransactionPending,
+  onCloseExtension,
+  onViewActivity,
+}: {
+  isDapp: boolean;
+  isSmartTransactionPending: boolean;
+  onCloseExtension: () => void;
+  onViewActivity: () => void;
+}) => {
+  return (
+    <Box
+      className="smart-transaction-status-page__footer"
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      width={BlockSize.Full}
+      padding={4}
+      paddingBottom={0}
+    >
+      <CloseExtensionButton
+        isDapp={isDapp}
+        isSmartTransactionPending={isSmartTransactionPending}
+        onCloseExtension={onCloseExtension}
+      />
+      <ViewActivityButton isDapp={isDapp} onViewActivity={onViewActivity} />
+    </Box>
+  );
+};
+
+const Title = ({ title }: { title: string }) => {
+  return (
+    <Text
+      color={TextColor.textDefault}
+      variant={TextVariant.headingMd}
+      as="h4"
+      fontWeight={FontWeight.Bold}
+    >
+      {title}
+    </Text>
+  );
+};
+
+const SmartTransactionsStatusIcon = ({
+  iconName,
+  iconColor,
+}: {
+  iconName: IconName;
+  iconColor: IconColor;
+}) => {
+  return (
+    <Box display={Display.Flex} style={{ fontSize: '48px' }}>
+      <Icon
+        name={iconName}
+        color={iconColor}
+        size={IconSize.Inherit}
+        marginBottom={4}
+      />
+    </Box>
+  );
+};
+
+export const SmartTransactionStatusPage = ({
+  requestState,
+  onCloseExtension,
+  onViewActivity,
+}: SmartTransactionStatusPageProps) => {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const { smartTransaction, isDapp, txId } = requestState;
+  const isSmartTransactionPending =
+    !smartTransaction ||
+    smartTransaction.status === SmartTransactionStatuses.PENDING;
+  const isSmartTransactionSuccess =
+    smartTransaction?.status === SmartTransactionStatuses.SUCCESS;
+  const isSmartTransactionCancelled = Boolean(
+    smartTransaction?.status?.startsWith(SmartTransactionStatuses.CANCELLED),
+  );
+  const featureFlags: {
+    smartTransactions?: {
+      expectedDeadline?: number;
+      maxDeadline?: number;
+    };
+  } | null = useSelector(getFeatureFlagsByChainId);
+  const stxEstimatedDeadline =
+    featureFlags?.smartTransactions?.expectedDeadline ||
+    FALLBACK_SMART_TRANSACTIONS_EXPECTED_DEADLINE;
+  const stxMaxDeadline =
+    featureFlags?.smartTransactions?.maxDeadline ||
+    FALLBACK_SMART_TRANSACTIONS_MAX_DEADLINE;
+  const {
+    timeLeftForPendingStxInSec,
+    isSmartTransactionTakingTooLong,
+    stxDeadline,
+  } = useRemainingTime({
+    isSmartTransactionPending,
+    smartTransaction,
+    stxMaxDeadline,
+    stxEstimatedDeadline,
+  });
+  const chainId: string = useSelector(getCurrentChainId);
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore: This same selector is used in the awaiting-swap component.
+  const fullTxData = useSelector((state) => getFullTxData(state, txId)) || {};
+
+  const countdown = isSmartTransactionPending ? (
+    <Text
+      display={Display.InlineBlock}
+      textAlign={TextAlign.Center}
+      color={TextColor.textAlternative}
+      variant={TextVariant.bodySm}
+      className="smart-transaction-status-page__countdown"
+    >
+      {showRemainingTimeInMinAndSec(timeLeftForPendingStxInSec)}
+    </Text>
+  ) : undefined;
+
+  const { title, description, iconName, iconColor } = getDisplayValues({
+    t,
+    countdown,
+    isSmartTransactionPending,
+    isSmartTransactionTakingTooLong,
+    isSmartTransactionSuccess,
+    isSmartTransactionCancelled,
+  });
+
+  useEffect(() => {
+    dispatch(hideLoadingIndication());
+  }, []);
+
+  const canShowSimulationDetails =
+    fullTxData.simulationData?.tokenBalanceChanges?.length > 0 ||
+    fullTxData.simulationData?.nativeBalanceChange;
+  const uuid = smartTransaction?.uuid;
+  const portfolioSmartTransactionStatusUrl =
+    uuid && chainId
+      ? `${BaseUrl.Portfolio}/networks/${Number(
+          hexToDecimal(chainId),
+        )}/smart-transactions/${uuid}`
+      : undefined;
+
+  return (
+    <Box
+      className="smart-transaction-status-page"
+      height={BlockSize.Full}
+      width={BlockSize.Full}
+      display={Display.Flex}
+      borderStyle={BorderStyle.none}
+      flexDirection={FlexDirection.Column}
+      alignItems={AlignItems.center}
+      marginBottom={0}
+    >
+      <Box
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        alignItems={AlignItems.center}
+        justifyContent={JustifyContent.center}
+        paddingLeft={4}
+        paddingRight={4}
+        width={BlockSize.Full}
+        style={{ flexGrow: 1 }}
+      >
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          alignItems={AlignItems.center}
+          paddingLeft={6}
+          paddingRight={6}
+          width={BlockSize.Full}
+        >
+          <Box
+            marginTop={3}
+            className="smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--top"
+          />
+          <SmartTransactionsStatusIcon
+            iconName={iconName}
+            iconColor={iconColor}
+          />
+          <Title title={title} />
+          <Deadline
+            isSmartTransactionPending={isSmartTransactionPending}
+            stxDeadline={stxDeadline}
+            timeLeftForPendingStxInSec={timeLeftForPendingStxInSec}
+          />
+          <Description description={description} />
+          <PortfolioSmartTransactionStatusUrl
+            portfolioSmartTransactionStatusUrl={
+              portfolioSmartTransactionStatusUrl
+            }
+            isSmartTransactionPending={isSmartTransactionPending}
+            onCloseExtension={onCloseExtension}
+          />
+        </Box>
+        {canShowSimulationDetails && (
+          <SimulationDetails
+            simulationData={fullTxData.simulationData}
+            transactionId={fullTxData.id}
+          />
+        )}
+        <Box
+          marginTop={3}
+          className="smart-transaction-status-page__background-animation smart-transaction-status-page__background-animation--bottom"
+        />
+      </Box>
+      <SmartTransactionsStatusPageFooter
+        isDapp={isDapp}
+        isSmartTransactionPending={isSmartTransactionPending}
+        onCloseExtension={onCloseExtension}
+        onViewActivity={onViewActivity}
+      />
+    </Box>
+  );
+};
+
+export default SmartTransactionStatusPage;
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transactions-status-page.test.js b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transactions-status-page.test.js
new file mode 100644
index 000000000000..852960825a23
--- /dev/null
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transactions-status-page.test.js
@@ -0,0 +1,145 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller/dist/types';
+
+import {
+  renderWithProvider,
+  createSwapsMockStore,
+} from '../../../../test/jest';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { SmartTransactionStatusPage } from '.';
+
+const middleware = [thunk];
+
+describe('SmartTransactionStatusPage', () => {
+  const requestState = {
+    smartTransaction: {
+      status: SmartTransactionStatuses.PENDING,
+      creationTime: Date.now(),
+    },
+  };
+
+  it('renders the component with initial props', () => {
+    const store = configureMockStore(middleware)(createSwapsMockStore());
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Submitting your transaction')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "Sorry for the wait" pending status', () => {
+    const store = configureMockStore(middleware)(createSwapsMockStore());
+    const newRequestState = {
+      ...requestState,
+      smartTransaction: {
+        ...requestState.smartTransaction,
+        creationTime: 1519211809934,
+      },
+    };
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={newRequestState} />,
+      store,
+    );
+    expect(getByText('Sorry for the wait')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "success" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status = SmartTransactionStatuses.SUCCESS;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction is complete')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "reverted" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status = SmartTransactionStatuses.REVERTED;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction failed')).toBeInTheDocument();
+    expect(
+      getByText(
+        'Sudden market changes can cause failures. If the problem continues, reach out to MetaMask customer support.',
+      ),
+    ).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "cancelled" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    requestState.smartTransaction = latestSmartTransaction;
+    latestSmartTransaction.status = SmartTransactionStatuses.CANCELLED;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction was canceled')).toBeInTheDocument();
+    expect(
+      getByText(
+        `Your transaction couldn't be completed, so it was canceled to save you from paying unnecessary gas fees.`,
+      ),
+    ).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "deadline_missed" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status =
+      SmartTransactionStatuses.CANCELLED_DEADLINE_MISSED;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction was canceled')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the "unknown" STX status', () => {
+    const mockStore = createSwapsMockStore();
+    const latestSmartTransaction =
+      mockStore.metamask.smartTransactionsState.smartTransactions[
+        CHAIN_IDS.MAINNET
+      ][1];
+    latestSmartTransaction.status = SmartTransactionStatuses.UNKNOWN;
+    requestState.smartTransaction = latestSmartTransaction;
+    const store = configureMockStore(middleware)(mockStore);
+    const { getByText, container } = renderWithProvider(
+      <SmartTransactionStatusPage requestState={requestState} />,
+      store,
+    );
+    expect(getByText('Your transaction failed')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/snaps/snap-view/snap-settings.js b/ui/pages/snaps/snap-view/snap-settings.js
index 420ea61afe96..25b06ae2fad6 100644
--- a/ui/pages/snaps/snap-view/snap-settings.js
+++ b/ui/pages/snaps/snap-view/snap-settings.js
@@ -40,7 +40,7 @@ import {
   getSnapLatestVersion,
   getSnapMetadata,
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-  getMemoizedMetaMaskIdentities,
+  getMemoizedMetaMaskInternalAccounts,
   ///: END:ONLY_INCLUDE_IF
 } from '../../../selectors';
 import {
@@ -77,7 +77,7 @@ function SnapSettings({ snapId }) {
   // eslint-disable-next-line no-unused-vars -- Main build does not use setKeyringAccounts
   const [keyringAccounts, setKeyringAccounts] = useState([]);
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-  const identities = useSelector(getMemoizedMetaMaskIdentities);
+  const internalAccounts = useSelector(getMemoizedMetaMaskInternalAccounts);
   ///: END:ONLY_INCLUDE_IF
 
   const connectedSubjects = useSelector((state) =>
@@ -99,13 +99,14 @@ function SnapSettings({ snapId }) {
     if (isKeyringSnap) {
       (async () => {
         const addresses = await getSnapAccountsById(snap.id);
-        const snapIdentities = Object.values(identities).filter((identity) =>
-          addresses.includes(identity.address.toLowerCase()),
+        const snapIdentities = Object.values(internalAccounts).filter(
+          (internalAccount) =>
+            addresses.includes(internalAccount.address.toLowerCase()),
         );
         setKeyringAccounts(snapIdentities);
       })();
     }
-  }, [snap?.id, identities, isKeyringSnap]);
+  }, [snap?.id, internalAccounts, isKeyringSnap]);
   ///: END:ONLY_INCLUDE_IF
 
   const onDisconnect = (connectedOrigin) => {
@@ -151,7 +152,9 @@ function SnapSettings({ snapId }) {
         </SnapDelineator>
       </Box>
       <Box className="snap-view__content__permissions" marginTop={12}>
-        <Text variant={TextVariant.bodyLgMedium}>{t('permissions')}</Text>
+        <Text variant={TextVariant.bodyLgMedium} marginBottom={1}>
+          {t('permissions')}
+        </Text>
         <SnapPermissionsList
           snapId={snapId}
           snapName={snapName}
diff --git a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
index dacb937294d9..777e253a70fe 100644
--- a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
+++ b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
@@ -8,14 +8,16 @@ import {
   getFetchParams,
   getApproveTxParams,
   prepareToLeaveSwaps,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
 } from '../../../ducks/swaps/swaps';
 import {
   isHardwareWallet,
   getHardwareWalletType,
 } from '../../../selectors/selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import {
   DEFAULT_ROUTE,
   BUILD_QUOTE_ROUTE,
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index 27d72f9edd73..e7f47bc3f006 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -22,6 +22,10 @@ import {
   getHardwareWalletType,
   getFullTxData,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 
 import {
   getUsedQuote,
@@ -32,8 +36,6 @@ import {
   navigateBackToBuildQuote,
   prepareForRetryGetQuotes,
   prepareToLeaveSwaps,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getMaxSlippage,
diff --git a/ui/pages/swaps/build-quote/build-quote.js b/ui/pages/swaps/build-quote/build-quote.js
index 36cdb780d9a8..23ca35b3f2e9 100644
--- a/ui/pages/swaps/build-quote/build-quote.js
+++ b/ui/pages/swaps/build-quote/build-quote.js
@@ -39,14 +39,11 @@ import {
   setFromTokenError,
   setMaxSlippage,
   setReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getFromTokenError,
   getMaxSlippage,
   getIsFeatureFlagLoaded,
-  getCurrentSmartTransactionsError,
   getSmartTransactionFees,
   getLatestAddedTokenTo,
 } from '../../../ducks/swaps/swaps';
@@ -61,6 +58,10 @@ import {
   getHardwareWalletType,
   getUseCurrencyRateCheck,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 
 import { getURLHostName } from '../../../helpers/utils/util';
 import { usePrevious } from '../../../hooks/usePrevious';
@@ -90,7 +91,6 @@ import {
   setBackgroundSwapRouteState,
   clearSwapsQuotes,
   stopPollingForQuotes,
-  setSmartTransactionsOptInStatus,
   clearSmartTransactionFees,
 } from '../../../store/actions';
 import { countDecimals, fetchTokenPrice } from '../swaps.util';
@@ -103,7 +103,6 @@ import {
   getValueFromWeiHex,
   hexToDecimal,
 } from '../../../../shared/modules/conversion.utils';
-import SmartTransactionsPopover from '../prepare-swap-page/smart-transactions-popover';
 
 const fuseSearchKeys = [
   { name: 'name', weight: 0.499 },
@@ -160,24 +159,8 @@ export default function BuildQuote({
     getCurrentSmartTransactionsEnabled,
   );
   const smartTransactionFees = useSelector(getSmartTransactionFees);
-  const smartTransactionsOptInPopoverDisplayed =
-    smartTransactionsOptInStatus !== undefined;
-  const currentSmartTransactionsError = useSelector(
-    getCurrentSmartTransactionsError,
-  );
   const currentCurrency = useSelector(getCurrentCurrency);
 
-  const showSmartTransactionsOptInPopover =
-    smartTransactionsEnabled && !smartTransactionsOptInPopoverDisplayed;
-
-  const onManageStxInSettings = (e) => {
-    e?.preventDefault();
-    setSmartTransactionsOptInStatus(false, smartTransactionsOptInStatus);
-  };
-
-  const onStartSwapping = () =>
-    setSmartTransactionsOptInStatus(true, smartTransactionsOptInStatus);
-
   const fetchParamsFromToken = isSwapsDefaultTokenSymbol(
     sourceTokenInfo?.symbol,
     chainId,
@@ -574,12 +557,6 @@ export default function BuildQuote({
   return (
     <div className="build-quote">
       <div className="build-quote__content">
-        <SmartTransactionsPopover
-          onStartSwapping={onStartSwapping}
-          onManageStxInSettings={onManageStxInSettings}
-          isOpen={showSmartTransactionsOptInPopover}
-        />
-
         <div className="build-quote__dropdown-input-pair-header">
           <div className="build-quote__input-label">{t('swapSwapFrom')}</div>
           {!isSwapsDefaultTokenSymbol(fromTokenSymbol, chainId) && (
@@ -766,8 +743,7 @@ export default function BuildQuote({
               )}
             </div>
           ))}
-        {(smartTransactionsEnabled ||
-          (!smartTransactionsEnabled && !isDirectWrappingEnabled)) && (
+        {!isDirectWrappingEnabled && (
           <div className="build-quote__slippage-buttons-container">
             <SlippageButtons
               onSelect={(newSlippage) => {
@@ -775,10 +751,6 @@ export default function BuildQuote({
               }}
               maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
               currentSlippage={maxSlippage}
-              smartTransactionsEnabled={smartTransactionsEnabled}
-              smartTransactionsOptInStatus={smartTransactionsOptInStatus}
-              setSmartTransactionsOptInStatus={setSmartTransactionsOptInStatus}
-              currentSmartTransactionsError={currentSmartTransactionsError}
               isDirectWrappingEnabled={isDirectWrappingEnabled}
             />
           </div>
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 28c122a30026..1182ad12d72a 100644
--- a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
+++ b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
@@ -26,13 +26,13 @@ import {
   getCurrentChainId,
   getRpcPrefsForCurrentProvider,
 } from '../../../selectors/selectors';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
-import { getURLHostName } from '../../../helpers/utils/util';
 import {
   getSmartTransactionsOptInStatus,
   getSmartTransactionsEnabled,
-  getCurrentSmartTransactionsEnabled,
-} from '../../../ducks/swaps/swaps';
+} from '../../../../shared/modules/selectors';
+import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
+import { getURLHostName } from '../../../helpers/utils/util';
+import { getCurrentSmartTransactionsEnabled } from '../../../ducks/swaps/swaps';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 
diff --git a/ui/pages/swaps/index.js b/ui/pages/swaps/index.js
index 4c71811a6872..968bde404ea0 100644
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@@ -44,8 +44,6 @@ import {
   fetchSwapsLivenessAndFeatureFlags,
   getReviewSwapClickedTimestamp,
   getPendingSmartTransactions,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getCurrentSmartTransactionsError,
   navigateBackToBuildQuote,
@@ -57,6 +55,10 @@ import {
   checkNetworkAndAccountSupports1559,
   getCurrentNetworkTransactions,
 } from '../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../shared/modules/selectors';
 import {
   AWAITING_SIGNATURES_ROUTE,
   AWAITING_SWAP_ROUTE,
diff --git a/ui/pages/swaps/loading-swaps-quotes/background-animation.js b/ui/pages/swaps/loading-swaps-quotes/background-animation.js
index 6cbbfea1cbb1..c3a144c30aec 100644
--- a/ui/pages/swaps/loading-swaps-quotes/background-animation.js
+++ b/ui/pages/swaps/loading-swaps-quotes/background-animation.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 import React from 'react';
 
 export default function BackgroundAnimation() {
diff --git a/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes-stories-metadata.js b/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes-stories-metadata.js
index 0915fe3b5df8..36e0b5ba089d 100644
--- a/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes-stories-metadata.js
+++ b/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes-stories-metadata.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 export const storiesMetadata = {
   totle: {
     color: '#283B4C',
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 ee964e8aaba6..e2691f9c7a2d 100644
--- a/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
+++ b/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
@@ -9,14 +9,16 @@ import {
   navigateBackToBuildQuote,
   getFetchParams,
   getQuotesFetchStartTime,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
 } from '../../../ducks/swaps/swaps';
 import {
   isHardwareWallet,
   getHardwareWalletType,
 } from '../../../selectors/selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { I18nContext } from '../../../contexts/i18n';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import Mascot from '../../../components/ui/mascot';
diff --git a/ui/pages/swaps/main-quote-summary/quote-backdrop.js b/ui/pages/swaps/main-quote-summary/quote-backdrop.js
index 77bd75fd68e0..44351c73bb5d 100644
--- a/ui/pages/swaps/main-quote-summary/quote-backdrop.js
+++ b/ui/pages/swaps/main-quote-summary/quote-backdrop.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 import React from 'react';
 import PropTypes from 'prop-types';
 
diff --git a/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js b/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js
index 805c56f7a3a5..a8fddf9943d7 100644
--- a/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js
+++ b/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js
@@ -1,3 +1,4 @@
+/* eslint-disable @metamask/design-tokens/color-no-hex*/
 import EventEmitter from 'events';
 import React, { useRef } from 'react';
 
diff --git a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
index 6f6eb0895b34..206936aed148 100644
--- a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
+++ b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
@@ -41,14 +41,11 @@ import {
   setFromTokenError,
   setMaxSlippage,
   setReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getFromTokenError,
   getMaxSlippage,
   getIsFeatureFlagLoaded,
-  getCurrentSmartTransactionsError,
   getFetchingQuotes,
   getSwapsErrorKey,
   getAggregatorMetadata,
@@ -68,6 +65,10 @@ import {
   getIsBridgeChain,
   getMetaMetricsId,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import {
   getValueFromWeiHex,
   hexToDecimal,
@@ -100,7 +101,6 @@ import {
   ignoreTokens,
   clearSwapsQuotes,
   stopPollingForQuotes,
-  setSmartTransactionsOptInStatus,
   clearSmartTransactionFees,
   setSwapsErrorKey,
   setBackgroundSwapRouteState,
@@ -138,7 +138,6 @@ import SwapsBannerAlert from '../swaps-banner-alert/swaps-banner-alert';
 import SwapsFooter from '../swaps-footer';
 import SelectedToken from '../selected-token/selected-token';
 import ListWithSearch from '../list-with-search/list-with-search';
-import SmartTransactionsPopover from './smart-transactions-popover';
 import QuotesLoadingAnimation from './quotes-loading-animation';
 import ReviewQuote from './review-quote';
 
@@ -217,28 +216,10 @@ export default function PrepareSwapPage({
   );
   const isSmartTransaction =
     currentSmartTransactionsEnabled && smartTransactionsOptInStatus;
-  const smartTransactionsOptInPopoverDisplayed =
-    smartTransactionsOptInStatus !== undefined;
-  const currentSmartTransactionsError = useSelector(
-    getCurrentSmartTransactionsError,
-  );
   const currentCurrency = useSelector(getCurrentCurrency);
   const fetchingQuotes = useSelector(getFetchingQuotes);
   const loadingComplete = !fetchingQuotes && areQuotesPresent;
 
-  const showSmartTransactionsOptInPopover =
-    smartTransactionsEnabled && !smartTransactionsOptInPopoverDisplayed;
-
-  const onManageStxInSettings = (e) => {
-    e?.preventDefault();
-    setSmartTransactionsOptInStatus(true, smartTransactionsOptInStatus);
-    dispatch(setTransactionSettingsOpened(true));
-  };
-
-  const onStartSwapping = () => {
-    setSmartTransactionsOptInStatus(true, smartTransactionsOptInStatus);
-  };
-
   const fetchParamsFromToken = isSwapsDefaultTokenSymbol(
     sourceTokenInfo?.symbol,
     chainId,
@@ -877,12 +858,6 @@ export default function PrepareSwapPage({
           </ModalContent>
         </Modal>
 
-        <SmartTransactionsPopover
-          onStartSwapping={onStartSwapping}
-          onManageStxInSettings={onManageStxInSettings}
-          isOpen={showSmartTransactionsOptInPopover}
-        />
-
         <div className="prepare-swap-page__swap-from-content">
           <Box
             display={DISPLAY.FLEX}
@@ -1130,25 +1105,19 @@ export default function PrepareSwapPage({
             />
           </Box>
         )}
-        {transactionSettingsOpened &&
-          (smartTransactionsEnabled ||
-            (!smartTransactionsEnabled && !isDirectWrappingEnabled)) && (
-            <TransactionSettings
-              onSelect={(newSlippage) => {
-                dispatch(setMaxSlippage(newSlippage));
-              }}
-              maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
-              currentSlippage={maxSlippage}
-              smartTransactionsEnabled={smartTransactionsEnabled}
-              smartTransactionsOptInStatus={smartTransactionsOptInStatus}
-              setSmartTransactionsOptInStatus={setSmartTransactionsOptInStatus}
-              currentSmartTransactionsError={currentSmartTransactionsError}
-              isDirectWrappingEnabled={isDirectWrappingEnabled}
-              onModalClose={() => {
-                dispatch(setTransactionSettingsOpened(false));
-              }}
-            />
-          )}
+        {transactionSettingsOpened && !isDirectWrappingEnabled && (
+          <TransactionSettings
+            onSelect={(newSlippage) => {
+              dispatch(setMaxSlippage(newSlippage));
+            }}
+            maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
+            currentSlippage={maxSlippage}
+            isDirectWrappingEnabled={isDirectWrappingEnabled}
+            onModalClose={() => {
+              dispatch(setTransactionSettingsOpened(false));
+            }}
+          />
+        )}
         {showQuotesLoadingAnimation && (
           <QuotesLoadingAnimation
             quoteCount={quoteCount}
diff --git a/ui/pages/swaps/prepare-swap-page/review-quote.js b/ui/pages/swaps/prepare-swap-page/review-quote.js
index 3b4d351d07da..a2a471e19917 100644
--- a/ui/pages/swaps/prepare-swap-page/review-quote.js
+++ b/ui/pages/swaps/prepare-swap-page/review-quote.js
@@ -41,10 +41,8 @@ import {
   getBackgroundSwapRouteState,
   swapsQuoteSelected,
   getReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
   signAndSendSwapsSmartTransaction,
   getSwapsNetworkConfig,
-  getSmartTransactionsEnabled,
   getSmartTransactionsError,
   getCurrentSmartTransactionsError,
   getSwapsSTXLoading,
@@ -63,13 +61,17 @@ import {
   getHardwareWalletType,
   checkNetworkAndAccountSupports1559,
   getUSDConversionRate,
-  getIsMultiLayerFeeNetwork,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { getNativeCurrency, getTokens } from '../../../ducks/metamask/metamask';
 import {
   setCustomApproveTxData,
   showModal,
   setSwapsQuotesPollingLimitEnabled,
+  getLayer1GasFee,
 } from '../../../store/actions';
 import {
   ASSET_ROUTE,
@@ -134,7 +136,6 @@ import {
 } from '../../../../shared/lib/transactions-controller-utils';
 import { addHexPrefix } from '../../../../app/scripts/lib/util';
 import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
-import fetchEstimatedL1Fee from '../../../helpers/utils/optimism/fetchEstimatedL1Fee';
 import ExchangeRateDisplay from '../exchange-rate-display';
 import InfoTooltip from '../../../components/ui/info-tooltip';
 import useRamps from '../../../hooks/experiences/useRamps';
@@ -196,7 +197,6 @@ export default function ReviewQuote({ setReceiveToAmount }) {
   const { balance: ethBalance } = useSelector(getSelectedAccount, shallowEqual);
   const conversionRate = useSelector(conversionRateSelector);
   const USDConversionRate = useSelector(getUSDConversionRate);
-  const isMultiLayerFeeNetwork = useSelector(getIsMultiLayerFeeNetwork);
   const currentCurrency = useSelector(getCurrentCurrency);
   const swapsTokens = useSelector(getTokens, isEqual);
   const networkAndAccountSupports1559 = useSelector(
@@ -986,20 +986,23 @@ export default function ReviewQuote({ setReceiveToAmount }) {
   ]);
 
   useEffect(() => {
-    if (!isMultiLayerFeeNetwork || !usedQuote?.multiLayerL1TradeFeeTotal) {
+    if (!usedQuote?.multiLayerL1TradeFeeTotal) {
       return;
     }
     const getEstimatedL1Fees = async () => {
       try {
         let l1ApprovalFeeTotal = '0x0';
         if (approveTxParams) {
-          l1ApprovalFeeTotal = await fetchEstimatedL1Fee(chainId, {
-            txParams: {
-              ...approveTxParams,
-              gasPrice: addHexPrefix(approveTxParams.gasPrice),
-              value: '0x0', // For approval txs we need to use "0x0" here.
-            },
-          });
+          l1ApprovalFeeTotal = await dispatch(
+            getLayer1GasFee({
+              transactionParams: {
+                ...approveTxParams,
+                gasPrice: addHexPrefix(approveTxParams.gasPrice),
+                value: '0x0', // For approval txs we need to use "0x0" here.
+              },
+              chainId,
+            }),
+          );
           setMultiLayerL1ApprovalFeeTotal(l1ApprovalFeeTotal);
         }
         const l1FeeTotal = sumHexes(
@@ -1014,13 +1017,7 @@ export default function ReviewQuote({ setReceiveToAmount }) {
       }
     };
     getEstimatedL1Fees();
-  }, [
-    unsignedTransaction,
-    approveTxParams,
-    isMultiLayerFeeNetwork,
-    chainId,
-    usedQuote,
-  ]);
+  }, [unsignedTransaction, approveTxParams, chainId, usedQuote]);
 
   const destinationValue = calcTokenValue(
     destinationTokenValue,
diff --git a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.stories.tsx b/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.stories.tsx
deleted file mode 100644
index ea53d12badec..000000000000
--- a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.stories.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { StoryFn, Meta } from '@storybook/react';
-import { useArgs } from '@storybook/client-api';
-import { ButtonVariant, Button } from '../../../components/component-library';
-import SmartTransactionPopover from './smart-transactions-popover';
-
-export default {
-  title: 'Pages/Swaps/SmartTransactionsPopover',
-  component: SmartTransactionPopover,
-  argTypes: {
-    isShowingModal: {
-      control: 'boolean',
-    },
-  },
-} as Meta<typeof SmartTransactionPopover>;
-
-export const DefaultStory: StoryFn<typeof SmartTransactionPopover> = () => {
-  const [{ isShowingModal }, updateArgs] = useArgs();
-  const toggleModal = () => updateArgs({ isShowingModal: !isShowingModal });
-
-  return (
-    <>
-      <Button variant={ButtonVariant.Primary} onClick={toggleModal}>
-        Open modal
-      </Button>
-      {isShowingModal && (
-        <SmartTransactionPopover
-          isOpen={isShowingModal}
-          onStartSwapping={() => {
-            console.log('onStartSwapping');
-          }}
-          onManageStxInSettings={toggleModal}
-        />
-      )}
-    </>
-  );
-};
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.tsx b/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.tsx
deleted file mode 100644
index ac3bcd53c804..000000000000
--- a/ui/pages/swaps/prepare-swap-page/smart-transactions-popover.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from 'react';
-
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  TextColor,
-  Display,
-  FlexDirection,
-  FontWeight,
-  BlockSize,
-  AlignItems,
-  JustifyContent,
-} from '../../../helpers/constants/design-system';
-import {
-  Modal,
-  ModalOverlay,
-  Text,
-  Box,
-  Button,
-  ButtonVariant,
-  ButtonLink,
-  ButtonLinkSize,
-} from '../../../components/component-library';
-import { ModalContent } from '../../../components/component-library/modal-content/deprecated';
-import { ModalHeader } from '../../../components/component-library/modal-header/deprecated';
-import { SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL } from '../../../../shared/constants/swaps';
-
-type Props = {
-  onStartSwapping: () => void;
-  onManageStxInSettings: () => void;
-  isOpen: boolean;
-};
-
-export default function SmartTransactionsPopover({
-  onStartSwapping,
-  onManageStxInSettings,
-  isOpen,
-}: Props) {
-  const t = useI18nContext();
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onStartSwapping}
-      isClosedOnOutsideClick={false}
-      isClosedOnEscapeKey={false}
-      className="mm-modal__custom-scrollbar"
-    >
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader
-          alignItems={AlignItems.center}
-          justifyContent={JustifyContent.center}
-        >
-          {t('smartSwapsAreHere')}
-        </ModalHeader>
-        <Box
-          display={Display.Flex}
-          flexDirection={FlexDirection.Column}
-          gap={4}
-          marginTop={4}
-        >
-          <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
-            <img
-              src="./images/logo/metamask-smart-transactions.png"
-              alt={t('swapSwapSwitch')}
-            />
-          </Box>
-          <Text>{t('smartSwapsDescription')}</Text>
-          <Text
-            as="ul"
-            marginTop={3}
-            marginBottom={3}
-            style={{ listStyle: 'inside' }}
-          >
-            <li key="stxBenefit1">{t('stxBenefit1')}</li>
-            <li key="stxBenefit2">{t('stxBenefit2')}</li>
-            <li key="stxBenefit3">{t('stxBenefit3')}</li>
-            <li key="stxBenefit4">
-              {t('stxBenefit4')}
-              <Text as="span" fontWeight={FontWeight.Normal}>
-                {' *'}
-              </Text>
-            </li>
-          </Text>
-          <Text color={TextColor.textAlternative}>
-            {t('smartSwapsDescription2', [
-              <ButtonLink
-                size={ButtonLinkSize.Inherit}
-                href={SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL}
-                externalLink
-                display={Display.Inline}
-                key="smartSwapsDescription2"
-              >
-                {t('faqAndRiskDisclosures')}
-              </ButtonLink>,
-            ])}
-          </Text>
-          <Button
-            variant={ButtonVariant.Primary}
-            onClick={onStartSwapping}
-            width={BlockSize.Full}
-          >
-            {t('enableSmartSwaps')}
-          </Button>
-          <Button
-            type="link"
-            variant={ButtonVariant.Link}
-            onClick={onManageStxInSettings}
-            width={BlockSize.Full}
-          >
-            {t('manageInSettings')}
-          </Button>
-        </Box>
-      </ModalContent>
-    </Modal>
-  );
-}
diff --git a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
index 198faf5e624f..9bdc3284c232 100644
--- a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
+++ b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
@@ -46,50 +46,3 @@ exports[`SlippageButtons renders the component with initial props 2`] = `
   </button>
 </div>
 `;
-
-exports[`SlippageButtons renders the component with the smart transaction opt-in button available, opt into STX 1`] = `
-<button
-  class="slippage-buttons__header slippage-buttons__header--open"
->
-  <div
-    class="slippage-buttons__header-text"
-  >
-    Advanced options
-  </div>
-  <i
-    class="fa fa-angle-up"
-  />
-</button>
-`;
-
-exports[`SlippageButtons renders the component with the smart transaction opt-in button available, opt into STX 2`] = `
-<div
-  class="button-group slippage-buttons__button-group radio-button-group"
-  role="radiogroup"
->
-  <button
-    aria-checked="false"
-    class="button-group__button radio-button"
-    data-testid="button-group__button0"
-    role="radio"
-  >
-    2%
-  </button>
-  <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
-    data-testid="button-group__button1"
-    role="radio"
-  >
-    3%
-  </button>
-  <button
-    aria-checked="false"
-    class="button-group__button slippage-buttons__button-group-custom-button radio-button"
-    data-testid="button-group__button2"
-    role="radio"
-  >
-    custom
-  </button>
-</div>
-`;
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
index 9b29065c6d42..647705182656 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
@@ -5,33 +5,12 @@ import { I18nContext } from '../../../contexts/i18n';
 import ButtonGroup from '../../../components/ui/button-group';
 import Button from '../../../components/ui/button';
 import InfoTooltip from '../../../components/ui/info-tooltip';
-import ToggleButton from '../../../components/ui/toggle-button';
-import Box from '../../../components/ui/box';
-import {
-  TextVariant,
-  FontWeight,
-  AlignItems,
-  Display,
-} from '../../../helpers/constants/design-system';
-import { getTranslatedStxErrorMessage } from '../swaps.util';
-import {
-  Slippage,
-  SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL,
-} from '../../../../shared/constants/swaps';
-import {
-  Text,
-  ButtonLink,
-  ButtonLinkSize,
-} from '../../../components/component-library';
+import { Slippage } from '../../../../shared/constants/swaps';
 
 export default function SlippageButtons({
   onSelect,
   maxAllowedSlippage,
   currentSlippage,
-  smartTransactionsEnabled,
-  smartTransactionsOptInStatus,
-  setSmartTransactionsOptInStatus,
-  currentSmartTransactionsError,
   isDirectWrappingEnabled,
 }) {
   const t = useContext(I18nContext);
@@ -207,57 +186,6 @@ export default function SlippageButtons({
                 </ButtonGroup>
               </div>
             )}
-            {smartTransactionsEnabled && (
-              <Box marginTop={2} display={Display.Flex}>
-                <Box
-                  display={Display.Flex}
-                  alignItems={AlignItems.center}
-                  paddingRight={3}
-                >
-                  <Text
-                    variant={TextVariant.bodySm}
-                    as="h6"
-                    paddingRight={2}
-                    fontWeight={FontWeight.Bold}
-                  >
-                    {t('smartSwaps')}
-                  </Text>
-                  {currentSmartTransactionsError ? (
-                    <InfoTooltip
-                      position="top"
-                      contentText={getTranslatedStxErrorMessage(
-                        currentSmartTransactionsError,
-                        t,
-                      )}
-                    />
-                  ) : (
-                    <InfoTooltip
-                      position="top"
-                      contentText={t('smartSwapsTooltip', [
-                        <ButtonLink
-                          key="smart-swaps-faq-and-risk-disclosures"
-                          size={ButtonLinkSize.Inherit}
-                          href={SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL}
-                          externalLink
-                          display={Display.Inline}
-                        >
-                          {t('faqAndRiskDisclosures')}
-                        </ButtonLink>,
-                      ])}
-                    />
-                  )}
-                </Box>
-                <ToggleButton
-                  value={smartTransactionsOptInStatus}
-                  onToggle={(value) => {
-                    setSmartTransactionsOptInStatus(!value, value);
-                  }}
-                  offLabel={t('off')}
-                  onLabel={t('on')}
-                  disabled={Boolean(currentSmartTransactionsError)}
-                />
-              </Box>
-            )}
           </>
         )}
         {errorText && (
@@ -272,9 +200,5 @@ SlippageButtons.propTypes = {
   onSelect: PropTypes.func.isRequired,
   maxAllowedSlippage: PropTypes.number.isRequired,
   currentSlippage: PropTypes.number,
-  smartTransactionsEnabled: PropTypes.bool.isRequired,
-  smartTransactionsOptInStatus: PropTypes.bool,
-  setSmartTransactionsOptInStatus: PropTypes.func,
-  currentSmartTransactionsError: PropTypes.string,
   isDirectWrappingEnabled: PropTypes.bool,
 };
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
index c0e8a18cbd96..7834eefd59ea 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
@@ -36,32 +36,6 @@ describe('SlippageButtons', () => {
     );
   });
 
-  it('renders the component with the smart transaction opt-in button available, opt into STX', () => {
-    const setSmartTransactionsOptInStatus = jest.fn();
-    const { getByText } = renderWithProvider(
-      <SlippageButtons
-        {...createProps({
-          smartTransactionsEnabled: true,
-          setSmartTransactionsOptInStatus,
-        })}
-      />,
-    );
-    expect(getByText('2%')).toBeInTheDocument();
-    expect(getByText('3%')).toBeInTheDocument();
-    expect(getByText('custom')).toBeInTheDocument();
-    expect(getByText('Advanced options')).toBeInTheDocument();
-    expect(
-      document.querySelector('.slippage-buttons__header'),
-    ).toMatchSnapshot();
-    expect(
-      document.querySelector('.slippage-buttons__button-group'),
-    ).toMatchSnapshot();
-    expect(getByText('Smart Swaps')).toBeInTheDocument();
-    expect(document.querySelector('.toggle-button--off')).toBeInTheDocument();
-    fireEvent.click(document.querySelector('.toggle-button'));
-    expect(setSmartTransactionsOptInStatus).toHaveBeenCalledWith(true, false);
-  });
-
   it('renders slippage with a custom value', () => {
     const { getByText } = renderWithProvider(
       <SlippageButtons {...createProps({ currentSlippage: 2.5 })} />,
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 0a3a66f927d9..ad60188f4ce1 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -10,8 +10,6 @@ import {
   getCurrentSmartTransactions,
   getSelectedQuote,
   getTopQuote,
-  getSmartTransactionsOptInStatus,
-  getSmartTransactionsEnabled,
   getCurrentSmartTransactionsEnabled,
   getSwapsNetworkConfig,
   cancelSwapsSmartTransaction,
@@ -22,6 +20,10 @@ import {
   getCurrentChainId,
   getRpcPrefsForCurrentProvider,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
 import {
   DEFAULT_ROUTE,
diff --git a/ui/pages/swaps/swaps-util-test-constants.js b/ui/pages/swaps/swaps-util-test-constants.js
index aa02f6a92487..4c69fd1077cd 100644
--- a/ui/pages/swaps/swaps-util-test-constants.js
+++ b/ui/pages/swaps/swaps-util-test-constants.js
@@ -1,3 +1,4 @@
+import { lightTheme } from '@metamask/design-tokens';
 import { ETH_SWAPS_TOKEN_OBJECT } from '../../../shared/constants/swaps';
 
 export const TRADES_BASE_PROD_URL =
@@ -161,12 +162,12 @@ export const MOCK_TRADE_RESPONSE_2 = MOCK_TRADE_RESPONSE_1.map((trade) => ({
 
 export const AGGREGATOR_METADATA = {
   agg1: {
-    color: '#283B4C',
+    color: lightTheme.colors.text.default,
     title: 'agg1',
     icon: 'data:image/png;base64,iVBORw0KGgoAAA',
   },
   agg2: {
-    color: '#283B4C',
+    color: lightTheme.colors.text.default,
     title: 'agg2',
     icon: 'data:image/png;base64,iVBORw0KGgoAAA',
   },
diff --git a/ui/pages/swaps/swaps.util.ts b/ui/pages/swaps/swaps.util.ts
index 5d6052fbb24d..1006cf2846be 100644
--- a/ui/pages/swaps/swaps.util.ts
+++ b/ui/pages/swaps/swaps.util.ts
@@ -49,6 +49,11 @@ const CACHE_REFRESH_FIVE_MINUTES = 300000;
 const USD_CURRENCY_CODE = 'usd';
 
 const clientIdHeader = { 'X-Client-Id': SWAPS_CLIENT_ID };
+const infuraAuthHeader = {
+  Authorization: `Basic ${Buffer.from(
+    `${process.env.INFURA_PROJECT_ID}:`,
+  ).toString('base64')}`,
+};
 
 type Validator = {
   property: string;
@@ -94,6 +99,8 @@ const AGGREGATOR_METADATA_VALIDATORS: Validator[] = [
   },
 ];
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const isValidDecimalNumber = (string: any): boolean =>
   !isNaN(string) && string.match(/^[.0-9]+$/u) && !isNaN(parseFloat(string));
 
@@ -117,6 +124,8 @@ const SWAP_GAS_PRICE_VALIDATOR: Validator[] = [
 
 export async function fetchToken(
   contractAddress: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   chainId: any,
 ): Promise<Json> {
   const tokenUrl = getBaseApi('token', chainId);
@@ -155,6 +164,8 @@ export async function fetchTokens(
   ];
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function fetchAggregatorMetadata(chainId: any): Promise<object> {
   const aggregatorMetadataUrl = getBaseApi('aggregatorMetadata', chainId);
   const aggregators = await fetchWithCache({
@@ -163,6 +174,8 @@ export async function fetchAggregatorMetadata(chainId: any): Promise<object> {
     cacheOptions: { cacheRefreshTime: CACHE_REFRESH_FIVE_MINUTES },
     functionName: 'fetchAggregatorMetadata',
   });
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const filteredAggregators = {} as any;
   for (const aggKey in aggregators) {
     if (
@@ -178,6 +191,8 @@ export async function fetchAggregatorMetadata(chainId: any): Promise<object> {
   return filteredAggregators;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function fetchTopAssets(chainId: any): Promise<object> {
   const topAssetsUrl = getBaseApi('topAssets', chainId);
   const response =
@@ -188,6 +203,8 @@ export async function fetchTopAssets(chainId: any): Promise<object> {
       cacheOptions: { cacheRefreshTime: CACHE_REFRESH_FIVE_MINUTES },
     })) || [];
   const topAssetsMap = response.reduce(
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (_topAssetsMap: any, asset: { address: string }, index: number) => {
       if (validateData(TOP_ASSET_VALIDATORS, asset, topAssetsUrl)) {
         return { ..._topAssetsMap, [asset.address]: { index: String(index) } };
@@ -199,6 +216,8 @@ export async function fetchTopAssets(chainId: any): Promise<object> {
   return topAssetsMap;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function fetchSwapsFeatureFlags(): Promise<any> {
   const v2ApiBaseUrl = process.env.SWAPS_USE_DEV_APIS
     ? SWAPS_DEV_API_V2_BASE_URL
@@ -213,6 +232,8 @@ export async function fetchSwapsFeatureFlags(): Promise<any> {
 
 export async function fetchTokenPrice(
   tokenContractAddress: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): Promise<any> {
   const query = `spot-prices?tokenAddresses=${tokenContractAddress}&vsCurrency=eth&includeMarketData=false`;
 
@@ -227,7 +248,11 @@ export async function fetchTokenPrice(
   return prices?.[tokenContractAddress]?.eth;
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function fetchSwapsGasPrices(chainId: any): Promise<
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   | any
   | {
       safeLow: string;
@@ -238,7 +263,13 @@ export async function fetchSwapsGasPrices(chainId: any): Promise<
   const gasPricesUrl = getBaseApi('gasPrices', chainId);
   const response = await fetchWithCache({
     url: gasPricesUrl,
-    fetchOptions: { method: 'GET', headers: clientIdHeader },
+    fetchOptions: {
+      method: 'GET',
+      headers: {
+        ...clientIdHeader,
+        ...infuraAuthHeader,
+      },
+    },
     cacheOptions: { cacheRefreshTime: 30000 },
     functionName: 'fetchSwapsGasPrices',
   });
@@ -424,11 +455,15 @@ export function quotesToRenderableData({
   conversionRate: number;
   currentCurrency: string;
   approveGas: string;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   tokenConversionRates: Record<string, any>;
   chainId: keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP;
   smartTransactionEstimatedGas: IndividualTxFees;
   nativeCurrencySymbol: string;
   multiLayerL1ApprovalFeeTotal: string | null;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 }): Record<string, any> {
   return Object.values(quotes).map((quote) => {
     const {
@@ -653,7 +688,11 @@ export const getNetworkNameByChainId = (chainId: string): string => {
  * @returns object with 2 items: "swapsFeatureIsLive"
  */
 export const getSwapsLivenessForNetwork = (
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   chainId: any,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   swapsFeatureFlags: any = {},
 ) => {
   const networkName = getNetworkNameByChainId(chainId);
@@ -685,6 +724,8 @@ export const getSwapsLivenessForNetwork = (
  * @param value
  * @returns number
  */
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const countDecimals = (value: any): number => {
   if (!value || Math.floor(value) === value) {
     return 0;
@@ -693,6 +734,8 @@ export const countDecimals = (value: any): number => {
 };
 
 export const showRemainingTimeInMinAndSec = (
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   remainingTimeInSec: any,
 ): string => {
   if (!Number.isInteger(remainingTimeInSec)) {
@@ -711,6 +754,8 @@ export enum StxErrorTypes {
 
 export const getTranslatedStxErrorMessage = (
   errorType: StxErrorTypes,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   t: (...args: any[]) => string,
 ): string => {
   switch (errorType) {
diff --git a/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap b/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
index 3acd3682e1d4..b9e19665bf99 100644
--- a/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
+++ b/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
@@ -31,37 +31,3 @@ exports[`TransactionSettings renders the component with initial props 1`] = `
   </button>
 </div>
 `;
-
-exports[`TransactionSettings renders the component with the smart transaction opt-in button available, opt into STX 1`] = `null`;
-
-exports[`TransactionSettings renders the component with the smart transaction opt-in button available, opt into STX 2`] = `
-<div
-  class="button-group transaction-settings__button-group radio-button-group"
-  role="radiogroup"
->
-  <button
-    aria-checked="false"
-    class="button-group__button radio-button"
-    data-testid="button-group__button0"
-    role="radio"
-  >
-    2%
-  </button>
-  <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
-    data-testid="button-group__button1"
-    role="radio"
-  >
-    3%
-  </button>
-  <button
-    aria-checked="false"
-    class="button-group__button transaction-settings__button-group-custom-button radio-button"
-    data-testid="button-group__button2"
-    role="radio"
-  >
-    custom
-  </button>
-</div>
-`;
diff --git a/ui/pages/swaps/transaction-settings/transaction-settings.js b/ui/pages/swaps/transaction-settings/transaction-settings.js
index 18611b67ffdd..51b35718d8f3 100644
--- a/ui/pages/swaps/transaction-settings/transaction-settings.js
+++ b/ui/pages/swaps/transaction-settings/transaction-settings.js
@@ -7,7 +7,6 @@ import { I18nContext } from '../../../contexts/i18n';
 import ButtonGroup from '../../../components/ui/button-group';
 import Button from '../../../components/ui/button';
 import InfoTooltip from '../../../components/ui/info-tooltip';
-import ToggleButton from '../../../components/ui/toggle-button';
 import Box from '../../../components/ui/box';
 import Typography from '../../../components/ui/typography';
 import {
@@ -17,22 +16,17 @@ import {
   DISPLAY,
   SEVERITIES,
   FlexDirection,
-  Display,
 } from '../../../helpers/constants/design-system';
-import { getTranslatedStxErrorMessage } from '../swaps.util';
 import {
   Slippage,
   SLIPPAGE_VERY_HIGH_ERROR,
   SLIPPAGE_NEGATIVE_ERROR,
-  SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL,
 } from '../../../../shared/constants/swaps';
 import {
   BannerAlert,
   Modal,
   ModalOverlay,
   ButtonPrimary,
-  ButtonLink,
-  ButtonLinkSize,
 } from '../../../components/component-library';
 import { ModalContent } from '../../../components/component-library/modal-content/deprecated';
 import { ModalHeader } from '../../../components/component-library/modal-header/deprecated';
@@ -44,10 +38,6 @@ export default function TransactionSettings({
   onModalClose,
   maxAllowedSlippage,
   currentSlippage,
-  smartTransactionsEnabled,
-  smartTransactionsOptInStatus,
-  setSmartTransactionsOptInStatus,
-  currentSmartTransactionsError,
   isDirectWrappingEnabled,
 }) {
   const t = useContext(I18nContext);
@@ -75,20 +65,13 @@ export default function TransactionSettings({
   });
   const [inputRef, setInputRef] = useState(null);
   const [newSlippage, setNewSlippage] = useState(currentSlippage);
-  const [newSmartTransactionsOptInStatus, setNewSmartTransactionsOptInStatus] =
-    useState(smartTransactionsOptInStatus);
 
-  const didFormChange =
-    newSlippage !== currentSlippage ||
-    newSmartTransactionsOptInStatus !== smartTransactionsOptInStatus;
+  const didFormChange = newSlippage !== currentSlippage;
 
   const updateTransactionSettings = () => {
     if (newSlippage !== currentSlippage) {
       onSelect(newSlippage);
     }
-    if (newSmartTransactionsOptInStatus !== smartTransactionsOptInStatus) {
-      setSmartTransactionsOptInStatus(newSmartTransactionsOptInStatus);
-    }
   };
 
   let notificationText = '';
@@ -148,12 +131,6 @@ export default function TransactionSettings({
     }
   }, [dispatch, activeButtonIndex]);
 
-  useEffect(() => {
-    if (newSmartTransactionsOptInStatus === undefined) {
-      setNewSmartTransactionsOptInStatus(smartTransactionsOptInStatus);
-    }
-  }, [smartTransactionsOptInStatus, newSmartTransactionsOptInStatus]);
-
   return (
     <Modal
       onClose={onModalClose}
@@ -176,63 +153,6 @@ export default function TransactionSettings({
         >
           <Box marginTop={7} marginBottom={5}>
             <>
-              {smartTransactionsEnabled && (
-                <Box
-                  marginTop={2}
-                  marginBottom={6}
-                  display={DISPLAY.FLEX}
-                  justifyContent={JustifyContent.spaceBetween}
-                >
-                  <Box
-                    display={DISPLAY.FLEX}
-                    alignItems={AlignItems.center}
-                    paddingRight={3}
-                  >
-                    <Typography
-                      variant={TypographyVariant.H6}
-                      boxProps={{ paddingRight: 2 }}
-                    >
-                      {t('smartSwaps')}
-                    </Typography>
-                    {currentSmartTransactionsError ? (
-                      <InfoTooltip
-                        position="top"
-                        iconFillColor="var(--color-icon-muted)"
-                        contentText={getTranslatedStxErrorMessage(
-                          currentSmartTransactionsError,
-                          t,
-                        )}
-                      />
-                    ) : (
-                      <InfoTooltip
-                        position="top"
-                        contentText={t('smartSwapsTooltip', [
-                          <ButtonLink
-                            key="smart-swaps-faq-and-risk-disclosures"
-                            size={ButtonLinkSize.Inherit}
-                            href={SMART_SWAPS_FAQ_AND_RISK_DISCLOSURES_URL}
-                            externalLink
-                            display={Display.Inline}
-                          >
-                            {t('faqAndRiskDisclosures')}
-                          </ButtonLink>,
-                        ])}
-                        iconFillColor="var(--color-icon-muted)"
-                      />
-                    )}
-                  </Box>
-                  <ToggleButton
-                    value={newSmartTransactionsOptInStatus}
-                    onToggle={(value) => {
-                      setNewSmartTransactionsOptInStatus(!value, value);
-                    }}
-                    offLabel={t('off')}
-                    onLabel={t('on')}
-                    disabled={Boolean(currentSmartTransactionsError)}
-                    dataTestId="transaction-settings-smart-swaps-toggle"
-                  />
-                </Box>
-              )}
               {!isDirectWrappingEnabled && (
                 <>
                   <Box display={DISPLAY.FLEX} alignItems={AlignItems.center}>
@@ -242,22 +162,11 @@ export default function TransactionSettings({
                     >
                       {t('swapsMaxSlippage')}
                     </Typography>
-                    {currentSmartTransactionsError ? (
-                      <InfoTooltip
-                        position="top"
-                        iconFillColor="var(--color-icon-muted)"
-                        contentText={getTranslatedStxErrorMessage(
-                          currentSmartTransactionsError,
-                          t,
-                        )}
-                      />
-                    ) : (
-                      <InfoTooltip
-                        position="top"
-                        iconFillColor="var(--color-icon-muted)"
-                        contentText={t('swapSlippageTooltip')}
-                      />
-                    )}
+                    <InfoTooltip
+                      position="top"
+                      iconFillColor="var(--color-icon-muted)"
+                      contentText={t('swapSlippageTooltip')}
+                    />
                   </Box>
                   <Box display={DISPLAY.FLEX}>
                     <ButtonGroup
@@ -394,9 +303,5 @@ TransactionSettings.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   maxAllowedSlippage: PropTypes.number.isRequired,
   currentSlippage: PropTypes.number,
-  smartTransactionsEnabled: PropTypes.bool.isRequired,
-  smartTransactionsOptInStatus: PropTypes.bool,
-  setSmartTransactionsOptInStatus: PropTypes.func,
-  currentSmartTransactionsError: PropTypes.string,
   isDirectWrappingEnabled: PropTypes.bool,
 };
diff --git a/ui/pages/swaps/transaction-settings/transaction-settings.test.js b/ui/pages/swaps/transaction-settings/transaction-settings.test.js
index c487b2f35a29..c7a29652751b 100644
--- a/ui/pages/swaps/transaction-settings/transaction-settings.test.js
+++ b/ui/pages/swaps/transaction-settings/transaction-settings.test.js
@@ -58,33 +58,6 @@ describe('TransactionSettings', () => {
     );
   });
 
-  it('renders the component with the smart transaction opt-in button available, opt into STX', async () => {
-    const setSmartTransactionsOptInStatus = jest.fn();
-    const { getByText, getByTestId } = renderWithProvider(
-      <TransactionSettings
-        {...createProps({
-          smartTransactionsEnabled: true,
-          setSmartTransactionsOptInStatus,
-        })}
-      />,
-      store,
-    );
-    expect(getByText('2%')).toBeInTheDocument();
-    expect(getByText('3%')).toBeInTheDocument();
-    expect(getByText('custom')).toBeInTheDocument();
-    expect(
-      document.querySelector('.transaction-settings__header'),
-    ).toMatchSnapshot();
-    expect(
-      document.querySelector('.transaction-settings__button-group'),
-    ).toMatchSnapshot();
-    expect(getByText('Smart Swaps')).toBeInTheDocument();
-    expect(document.querySelector('.toggle-button--off')).toBeInTheDocument();
-    await fireEvent.click(document.querySelector('.toggle-button'));
-    await fireEvent.click(getByTestId('update-transaction-settings-button'));
-    expect(setSmartTransactionsOptInStatus).toHaveBeenCalledWith(true);
-  });
-
   it('renders slippage with a custom value', () => {
     const { getByText } = renderWithProvider(
       <TransactionSettings {...createProps({ currentSlippage: 2.5 })} />,
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index 0b139113f68e..3525cb457f94 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -42,10 +42,8 @@ import {
   swapsQuoteSelected,
   getSwapsQuoteRefreshTime,
   getReviewSwapClickedTimestamp,
-  getSmartTransactionsOptInStatus,
   signAndSendSwapsSmartTransaction,
   getSwapsNetworkConfig,
-  getSmartTransactionsEnabled,
   getSmartTransactionsError,
   getCurrentSmartTransactionsError,
   getSwapsSTXLoading,
@@ -64,10 +62,14 @@ import {
   getHardwareWalletType,
   checkNetworkAndAccountSupports1559,
   getUSDConversionRate,
-  getIsMultiLayerFeeNetwork,
 } from '../../../selectors';
+import {
+  getSmartTransactionsOptInStatus,
+  getSmartTransactionsEnabled,
+} from '../../../../shared/modules/selectors';
 import { getNativeCurrency, getTokens } from '../../../ducks/metamask/metamask';
 import {
+  getLayer1GasFee,
   safeRefetchQuotes,
   setCustomApproveTxData,
   setSwapsErrorKey,
@@ -108,7 +110,6 @@ import {
 } from '../../../../shared/lib/transactions-controller-utils';
 import { addHexPrefix } from '../../../../app/scripts/lib/util';
 import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
-import fetchEstimatedL1Fee from '../../../helpers/utils/optimism/fetchEstimatedL1Fee';
 import {
   addHexes,
   decGWEIToHexWEI,
@@ -168,7 +169,6 @@ export default function ViewQuote() {
   const { balance: ethBalance } = useSelector(getSelectedAccount, shallowEqual);
   const conversionRate = useSelector(conversionRateSelector);
   const USDConversionRate = useSelector(getUSDConversionRate);
-  const isMultiLayerFeeNetwork = useSelector(getIsMultiLayerFeeNetwork);
   const currentCurrency = useSelector(getCurrentCurrency);
   const swapsTokens = useSelector(getTokens, isEqual);
   const networkAndAccountSupports1559 = useSelector(
@@ -888,20 +888,23 @@ export default function ViewQuote() {
   ]);
 
   useEffect(() => {
-    if (!isMultiLayerFeeNetwork || !usedQuote?.multiLayerL1TradeFeeTotal) {
+    if (!usedQuote?.multiLayerL1TradeFeeTotal) {
       return;
     }
     const getEstimatedL1Fees = async () => {
       try {
         let l1ApprovalFeeTotal = '0x0';
         if (approveTxParams) {
-          l1ApprovalFeeTotal = await fetchEstimatedL1Fee(chainId, {
-            txParams: {
-              ...approveTxParams,
-              gasPrice: addHexPrefix(approveTxParams.gasPrice),
-              value: '0x0', // For approval txs we need to use "0x0" here.
-            },
-          });
+          l1ApprovalFeeTotal = await dispatch(
+            getLayer1GasFee({
+              transactionParams: {
+                ...approveTxParams,
+                gasPrice: addHexPrefix(approveTxParams.gasPrice),
+                value: '0x0', // For approval txs we need to use "0x0" here.
+              },
+              chainId,
+            }),
+          );
           setMultiLayerL1ApprovalFeeTotal(l1ApprovalFeeTotal);
         }
         const l1FeeTotal = sumHexes(
@@ -916,13 +919,7 @@ export default function ViewQuote() {
       }
     };
     getEstimatedL1Fees();
-  }, [
-    unsignedTransaction,
-    approveTxParams,
-    isMultiLayerFeeNetwork,
-    chainId,
-    usedQuote,
-  ]);
+  }, [unsignedTransaction, approveTxParams, chainId, usedQuote]);
 
   useEffect(() => {
     if (isSmartTransaction) {
diff --git a/ui/pages/token-details/token-details-page.test.js b/ui/pages/token-details/token-details-page.test.js
index 6a4eba037425..a2f00370a9bf 100644
--- a/ui/pages/token-details/token-details-page.test.js
+++ b/ui/pages/token-details/token-details-page.test.js
@@ -10,7 +10,6 @@ import TokenDetailsPage from './token-details-page';
 const testTokenAddress = '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F';
 const state = {
   metamask: {
-    selectedAddress: '0xAddress',
     internalAccounts: {
       accounts: {
         'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
diff --git a/ui/selectors/alerts.test.ts b/ui/selectors/alerts.test.ts
new file mode 100644
index 000000000000..d9183960116e
--- /dev/null
+++ b/ui/selectors/alerts.test.ts
@@ -0,0 +1,103 @@
+import { Severity } from '../helpers/constants/design-system';
+import {
+  selectAlerts,
+  selectGeneralAlerts,
+  selectConfirmedAlertKeys,
+  AlertsState,
+} from './alerts';
+
+describe('Alerts Selectors', () => {
+  const ownerId1Mock = 'owner1';
+  const ownerId2Mock = 'owner2';
+  const ownerId3Mock = 'owner3';
+  const mockedState = {
+    confirmAlerts: {
+      alerts: {
+        [ownerId1Mock]: [
+          {
+            key: '1',
+            severity: Severity.Danger,
+            message: 'Alert 1',
+            field: 'field1',
+          },
+          {
+            key: '2',
+            severity: Severity.Danger,
+            message: 'Alert 2',
+            field: 'field2',
+          },
+        ],
+        [ownerId2Mock]: [
+          {
+            key: '3',
+            severity: Severity.Danger,
+            message: 'Alert 3',
+            field: 'field3',
+          },
+          {
+            key: '4',
+            severity: Severity.Warning,
+            message: 'Alert 4',
+            field: 'field4',
+          },
+        ],
+      },
+      confirmed: {
+        [ownerId1Mock]: {
+          '1': true,
+          '2': false,
+        },
+        [ownerId2Mock]: {
+          '3': true,
+          '4': true,
+        },
+      },
+    },
+  } as AlertsState;
+
+  describe('selectAlerts', () => {
+    it('returns alerts for a specific owner', () => {
+      const alerts = selectAlerts(mockedState, ownerId1Mock);
+      expect(alerts).toEqual(mockedState.confirmAlerts.alerts[ownerId1Mock]);
+    });
+
+    it('returns an empty array if owner has no alerts', () => {
+      const alerts = selectAlerts(mockedState, ownerId3Mock);
+      expect(alerts).toEqual([]);
+    });
+  });
+
+  describe('selectGeneralAlerts', () => {
+    it('returns general alerts for a specific owner', () => {
+      const generalAlerts = selectGeneralAlerts(mockedState, ownerId1Mock);
+      const expectedGeneralAlerts = mockedState.confirmAlerts.alerts[
+        ownerId1Mock
+      ].filter((alert) => !alert.field);
+
+      expect(generalAlerts).toEqual(expectedGeneralAlerts);
+    });
+
+    it('returns an empty array if owner has no general alerts', () => {
+      const generalAlerts = selectGeneralAlerts(mockedState, ownerId2Mock);
+      expect(generalAlerts).toEqual([]);
+    });
+  });
+
+  describe('selectConfirmedAlertKeys', () => {
+    it('returns confirmed alert keys for a specific owner', () => {
+      const confirmedAlertKeys = selectConfirmedAlertKeys(
+        mockedState,
+        ownerId2Mock,
+      );
+      expect(confirmedAlertKeys).toEqual(['3', '4']);
+    });
+
+    it('returns an empty array if owner has no confirmed alerts', () => {
+      const confirmedAlertKeys = selectConfirmedAlertKeys(
+        mockedState,
+        ownerId3Mock,
+      );
+      expect(confirmedAlertKeys).toEqual([]);
+    });
+  });
+});
diff --git a/ui/selectors/alerts.ts b/ui/selectors/alerts.ts
new file mode 100644
index 000000000000..15d6d0a881c3
--- /dev/null
+++ b/ui/selectors/alerts.ts
@@ -0,0 +1,27 @@
+import { createSelector } from 'reselect';
+import {
+  Alert,
+  ConfirmAlertsState,
+} from '../ducks/confirm-alerts/confirm-alerts';
+
+export type AlertsState = {
+  confirmAlerts: ConfirmAlertsState;
+};
+
+export function selectAlerts(state: AlertsState, ownerId: string): Alert[] {
+  return state.confirmAlerts.alerts[ownerId] ?? [];
+}
+
+export const selectGeneralAlerts = createSelector(
+  (state: AlertsState, ownerId: string) => selectAlerts(state, ownerId),
+  (alerts) => alerts.filter((alert) => !alert.field),
+);
+
+export function selectConfirmedAlertKeys(
+  state: AlertsState,
+  ownerId: string,
+): string[] {
+  const { confirmed } = state.confirmAlerts;
+  const ownerConfirmed = confirmed[ownerId] || {};
+  return Object.keys(ownerConfirmed).filter((key) => ownerConfirmed[key]);
+}
diff --git a/ui/selectors/first-time-flow.js b/ui/selectors/first-time-flow.js
index c350ffee1986..f7d4cc92ac76 100644
--- a/ui/selectors/first-time-flow.js
+++ b/ui/selectors/first-time-flow.js
@@ -3,21 +3,53 @@ import {
   DEFAULT_ROUTE,
   ONBOARDING_CREATE_PASSWORD_ROUTE,
   ONBOARDING_IMPORT_WITH_SRP_ROUTE,
+  ONBOARDING_METAMETRICS,
+  ONBOARDING_SECURE_YOUR_WALLET_ROUTE,
 } from '../helpers/constants/routes';
 
-export function getFirstTimeFlowTypeRoute(state) {
+/**
+ * When the user unlocks the wallet but onboarding has not fully completed we
+ * must direct the user to the appropriate step in the onboarding process.
+ *
+ * @param {object} state - MetaMask state tree
+ * @returns {string} Route to redirect the user to
+ */
+export function getFirstTimeFlowTypeRouteAfterUnlock(state) {
   const { firstTimeFlowType } = state.metamask;
 
-  let nextRoute;
   if (firstTimeFlowType === FirstTimeFlowType.create) {
-    nextRoute = ONBOARDING_CREATE_PASSWORD_ROUTE;
+    return ONBOARDING_CREATE_PASSWORD_ROUTE;
   } else if (firstTimeFlowType === FirstTimeFlowType.import) {
-    nextRoute = ONBOARDING_IMPORT_WITH_SRP_ROUTE;
-  } else {
-    nextRoute = DEFAULT_ROUTE;
+    return ONBOARDING_IMPORT_WITH_SRP_ROUTE;
+  } else if (firstTimeFlowType === FirstTimeFlowType.restore) {
+    return ONBOARDING_METAMETRICS;
   }
+  return DEFAULT_ROUTE;
+}
+
+/**
+ * The onboarding flow first asks the user what process they wish to use to
+ * initialize their wallet (either create, import, or restore). After that it
+ * asks the user to opt into MetaMetrics. This function returns the route the
+ * user should be directed to after they opt in or out of MetaMetrics. Note
+ * that this differs from getFirstTimeFlowTypeRouteAfterUnlock only for the
+ * restore option because the restore option is atypical from the other two
+ * options and removes an entire screen from the onboarding flow.
+ *
+ * @param {object} state - MetaMask state tree
+ * @returns {string} Route to redirect the user to
+ */
+export function getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn(state) {
+  const { firstTimeFlowType } = state.metamask;
 
-  return nextRoute;
+  if (firstTimeFlowType === FirstTimeFlowType.create) {
+    return ONBOARDING_CREATE_PASSWORD_ROUTE;
+  } else if (firstTimeFlowType === FirstTimeFlowType.import) {
+    return ONBOARDING_IMPORT_WITH_SRP_ROUTE;
+  } else if (firstTimeFlowType === FirstTimeFlowType.restore) {
+    return ONBOARDING_SECURE_YOUR_WALLET_ROUTE;
+  }
+  return DEFAULT_ROUTE;
 }
 
 export const getFirstTimeFlowType = (state) => {
diff --git a/ui/selectors/institutional/selectors.js b/ui/selectors/institutional/selectors.js
index d012eb13cebd..7d0567d0b67b 100644
--- a/ui/selectors/institutional/selectors.js
+++ b/ui/selectors/institutional/selectors.js
@@ -94,7 +94,7 @@ export function getIsCustodianSupportedChain(state) {
 
 export function getMMIAddressFromModalOrAddress(state) {
   const modalAddress = state?.appState?.modal?.modalState?.props?.address;
-  const selectedAddress = state?.metamask?.selectedAddress;
+  const selectedAddress = getSelectedInternalAccount(state)?.address;
 
   return modalAddress || selectedAddress;
 }
diff --git a/ui/selectors/institutional/selectors.test.js b/ui/selectors/institutional/selectors.test.js
index 10a96dd8e017..4645b59ad633 100644
--- a/ui/selectors/institutional/selectors.test.js
+++ b/ui/selectors/institutional/selectors.test.js
@@ -1,6 +1,7 @@
 import { toChecksumAddress } from 'ethereumjs-util';
 import { EthAccountType, EthMethod } from '@metamask/keyring-api';
 import { toHex } from '@metamask/controller-utils';
+import { createMockInternalAccount } from '../../../test/jest/mocks';
 import {
   getConfiguredCustodians,
   getCustodianIconForAddress,
@@ -37,7 +38,14 @@ function buildState(overrides = {}) {
               },
             },
             options: {},
-            methods: [...Object.values(EthMethod)],
+            methods: [
+              EthMethod.PersonalSign,
+              EthMethod.Sign,
+              EthMethod.SignTransaction,
+              EthMethod.SignTypedDataV1,
+              EthMethod.SignTypedDataV3,
+              EthMethod.SignTypedDataV4,
+            ],
             type: EthAccountType.Eoa,
             code: '0x',
             balance: '0x47c9d71831c76efe',
@@ -322,7 +330,6 @@ describe('Institutional selectors', () => {
           },
           keyrings: [],
           custodianSupportedChains: {},
-          selectedAddress: accountAddress,
           providerConfig: {},
         },
       });
@@ -364,7 +371,6 @@ describe('Institutional selectors', () => {
             },
           ],
           custodianSupportedChains: {},
-          selectedAddress: accountAddress,
           providerConfig: null,
         },
       });
@@ -408,7 +414,6 @@ describe('Institutional selectors', () => {
           custodianSupportedChains: {
             [accountAddress]: null,
           },
-          selectedAddress: accountAddress,
           providerConfig: {
             chainId: toHex(1),
           },
@@ -456,7 +461,6 @@ describe('Institutional selectors', () => {
               supportedChains: [],
             },
           },
-          selectedAddress: accountAddress,
           providerConfig: {
             chainId: toHex(1),
           },
@@ -504,7 +508,6 @@ describe('Institutional selectors', () => {
               supportedChains: ['1'],
             },
           },
-          selectedAddress: accountAddress,
           providerConfig: {
             chainId: 1,
           },
@@ -552,7 +555,6 @@ describe('Institutional selectors', () => {
               supportedChains: ['1'],
             },
           },
-          selectedAddress: accountAddress,
           providerConfig: {
             chainId: 'not a hex number',
           },
@@ -566,6 +568,12 @@ describe('Institutional selectors', () => {
   });
 
   describe('getMMIAddressFromModalOrAddress', () => {
+    const mockInternalAccount = createMockInternalAccount({
+      id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
+      name: 'Custody Account A',
+      keyringType: 'Custody',
+    });
+
     it('returns modalAddress if it exists', () => {
       const state = {
         appState: {
@@ -578,7 +586,10 @@ describe('Institutional selectors', () => {
           },
         },
         metamask: {
-          selectedAddress: 'selectedAddress',
+          internalAccounts: {
+            accounts: {},
+            selectedAccount: '',
+          },
         },
       };
 
@@ -587,7 +598,7 @@ describe('Institutional selectors', () => {
       expect(address).toBe('modalAddress');
     });
 
-    it('returns selectedAddress if modalAddress does not exist', () => {
+    it('returns selectedAccount if modalAddress does not exist', () => {
       const state = {
         appState: {
           modal: {
@@ -597,16 +608,21 @@ describe('Institutional selectors', () => {
           },
         },
         metamask: {
-          selectedAddress: 'selectedAddress',
+          internalAccounts: {
+            accounts: {
+              [mockInternalAccount.id]: mockInternalAccount,
+            },
+            selectedAccount: mockInternalAccount.id,
+          },
         },
       };
 
       const address = getMMIAddressFromModalOrAddress(state);
 
-      expect(address).toBe('selectedAddress');
+      expect(address).toBe(mockInternalAccount.address);
     });
 
-    it('returns undefined if neither modalAddress nor selectedAddress exist', () => {
+    it('returns undefined if neither modalAddress nor selectedAccount exist', () => {
       const state = {
         appState: {
           modal: {
@@ -615,7 +631,12 @@ describe('Institutional selectors', () => {
             },
           },
         },
-        metamask: {},
+        metamask: {
+          internalAccounts: {
+            accounts: {},
+            selectedAccount: '',
+          },
+        },
       };
 
       const address = getMMIAddressFromModalOrAddress(state);
diff --git a/ui/selectors/nonce-sorted-transactions-selector.test.js b/ui/selectors/nonce-sorted-transactions-selector.test.js
index 2f81627a4233..a3488a20a13b 100644
--- a/ui/selectors/nonce-sorted-transactions-selector.test.js
+++ b/ui/selectors/nonce-sorted-transactions-selector.test.js
@@ -86,7 +86,6 @@ const getStateTree = ({
       chainId: CHAIN_IDS.MAINNET,
     },
     unapprovedMsgs,
-    selectedAddress: SENDERS.ONE,
     internalAccounts: {
       accounts: {
         'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
diff --git a/ui/selectors/permissions.js b/ui/selectors/permissions.js
index 4211b6cbffb7..cb6a0e606f97 100644
--- a/ui/selectors/permissions.js
+++ b/ui/selectors/permissions.js
@@ -73,6 +73,10 @@ export function getPermittedAccountsForCurrentTab(state) {
   return getPermittedAccounts(state, getOriginOfCurrentTab(state));
 }
 
+export function getPermittedAccountsForSelectedTab(state, activeTab) {
+  return getPermittedAccounts(state, activeTab);
+}
+
 /**
  * Returns a map of permitted accounts by origin for all origins.
  *
@@ -101,7 +105,7 @@ export function getPermittedAccountsByOrigin(state) {
  * @returns {Array<object>} An array of connected subject objects.
  */
 export function getConnectedSubjectsForSelectedAddress(state) {
-  const { selectedAddress } = state.metamask;
+  const selectedInternalAccount = getSelectedInternalAccount(state);
   const subjects = getPermissionSubjects(state);
   const subjectMetadata = getSubjectMetadata(state);
 
@@ -109,7 +113,7 @@ export function getConnectedSubjectsForSelectedAddress(state) {
 
   Object.entries(subjects).forEach(([subjectKey, subjectValue]) => {
     const exposedAccounts = getAccountsFromSubject(subjectValue);
-    if (!exposedAccounts.includes(selectedAddress)) {
+    if (!exposedAccounts.includes(selectedInternalAccount.address)) {
       return;
     }
 
@@ -137,7 +141,8 @@ export function getConnectedSubjectsForAllAddresses(state) {
       if (!accountsToConnections[address]) {
         accountsToConnections[address] = [];
       }
-      accountsToConnections[address].push(subjectMetadata[subjectKey] || {});
+      const metadata = subjectMetadata[subjectKey];
+      accountsToConnections[address].push({ origin: subjectKey, ...metadata });
     });
   });
 
@@ -220,6 +225,14 @@ export function getAddressConnectedSubjectMap(state) {
   return addressConnectedIconMap;
 }
 
+export const isAccountConnectedToCurrentTab = createDeepEqualSelector(
+  getPermittedAccountsForCurrentTab,
+  (_state, address) => address,
+  (permittedAccounts, address) => {
+    return permittedAccounts.some((account) => account === address);
+  },
+);
+
 // selector helpers
 
 function getAccountsFromSubject(subject) {
@@ -313,6 +326,44 @@ export function getOrderedConnectedAccountsForActiveTab(state) {
     );
 }
 
+export function getOrderedConnectedAccountsForConnectedDapp(state, activeTab) {
+  const {
+    metamask: { permissionHistory },
+  } = state;
+
+  const permissionHistoryByAccount =
+    // eslint-disable-next-line camelcase
+    permissionHistory[activeTab.origin]?.eth_accounts?.accounts;
+  const orderedAccounts = getMetaMaskAccountsOrdered(state);
+  const connectedAccounts = getPermittedAccountsForSelectedTab(
+    state,
+    activeTab,
+  );
+
+  return orderedAccounts
+    .filter((account) => connectedAccounts.includes(account.address))
+    .map((account) => ({
+      ...account,
+      metadata: {
+        ...account.metadata,
+        lastActive: permissionHistoryByAccount?.[account.address],
+      },
+    }))
+    .sort(
+      ({ lastSelected: lastSelectedA }, { lastSelected: lastSelectedB }) => {
+        if (lastSelectedA === lastSelectedB) {
+          return 0;
+        } else if (lastSelectedA === undefined) {
+          return 1;
+        } else if (lastSelectedB === undefined) {
+          return -1;
+        }
+
+        return lastSelectedB - lastSelectedA;
+      },
+    );
+}
+
 export function getPermissionsForActiveTab(state) {
   const { activeTab, metamask } = state;
   const { subjects = {} } = metamask;
diff --git a/ui/selectors/permissions.test.js b/ui/selectors/permissions.test.js
index a5ee6e1dac62..9bf5b1a0aa96 100644
--- a/ui/selectors/permissions.test.js
+++ b/ui/selectors/permissions.test.js
@@ -1,5 +1,6 @@
 import { EthAccountType, EthMethod } from '@metamask/keyring-api';
 import { CHAIN_IDS } from '../../shared/constants/network';
+import { createMockInternalAccount } from '../../test/jest/mocks';
 import {
   getConnectedSubjectsForSelectedAddress,
   getLastConnectedInfo,
@@ -30,7 +31,6 @@ describe('selectors', () => {
             },
             selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
           },
-          selectedAddress: '0x8e5d75d60224ea0c33d0041e75de68b1c3cb6dd5',
           subjectMetadata: {
             'peepeth.com': {
               iconUrl: 'https://peepeth.com/favicon-32x32.png',
@@ -95,9 +95,43 @@ describe('selectors', () => {
     });
 
     it('should return the list of connected subjects when there are 2 connected accounts', () => {
+      const mockInternalAccount = createMockInternalAccount({
+        name: 'Really Long Name That Should Be Truncated',
+        id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
+        address: '0x7250739de134d33ec7ab1ee592711e15098c9d2d',
+      });
+      const mockInternalAccount2 = createMockInternalAccount({
+        name: 'Account 1',
+        id: 'ee414e10-a203-4b65-83c2-b5308e45af8e',
+        address: '0x8e5d75d60224ea0c33d0041e75de68b1c3cb6dd5',
+      });
+      const mockInternalAccount3 = createMockInternalAccount({
+        name: 'Account 2',
+        id: '0402ace6-1ca7-406f-905a-ffb32cc8c18d',
+        address: '0xb3958fb96c8201486ae20be1d5c9f58083df343a',
+      });
+      const mockInternalAccount4 = createMockInternalAccount({
+        name: 'Account 3',
+        id: '9d9488b5-5957-4523-8fd9-03a3715a93c2',
+        address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+      });
+      const mockInternalAccount5 = createMockInternalAccount({
+        name: 'Account 4',
+        id: '317c0f71-5e3f-4039-8929-4caded1c9e44',
+        address: '0x617b3f8050a0bd94b6b1da02b4384ee5b4df13f4',
+      });
       const mockState = {
         metamask: {
-          selectedAddress: '0x7250739de134d33ec7ab1ee592711e15098c9d2d',
+          internalAccounts: {
+            accounts: {
+              [mockInternalAccount.id]: mockInternalAccount,
+              [mockInternalAccount2.id]: mockInternalAccount2,
+              [mockInternalAccount3.id]: mockInternalAccount3,
+              [mockInternalAccount4.id]: mockInternalAccount4,
+              [mockInternalAccount5.id]: mockInternalAccount5,
+            },
+            selectedAccount: mockInternalAccount.id,
+          },
           subjectMetadata: {
             'peepeth.com': {
               iconUrl: 'https://peepeth.com/favicon-32x32.png',
@@ -305,31 +339,6 @@ describe('selectors', () => {
             },
           },
         },
-        identities: {
-          '0x7250739de134d33ec7ab1ee592711e15098c9d2d': {
-            address: '0x7250739de134d33ec7ab1ee592711e15098c9d2d',
-            name: 'Really Long Name That Should Be Truncated',
-          },
-          '0x8e5d75d60224ea0c33d0041e75de68b1c3cb6dd5': {
-            address: '0x8e5d75d60224ea0c33d0041e75de68b1c3cb6dd5',
-            lastSelected: 1586359844192,
-            name: 'Account 1',
-          },
-          '0xb3958fb96c8201486ae20be1d5c9f58083df343a': {
-            lastSelected: 1586359844193,
-            address: '0xb3958fb96c8201486ae20be1d5c9f58083df343a',
-            name: 'Account 2',
-          },
-          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
-            address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-            lastSelected: 1586359844192,
-            name: 'Account 3',
-          },
-          '0x617b3f8050a0bd94b6b1da02b4384ee5b4df13f4': {
-            address: '0x617b3f8050a0bd94b6b1da02b4384ee5b4df13f4',
-            name: 'Account 4',
-          },
-        },
         keyrings: [
           {
             accounts: [
@@ -478,20 +487,6 @@ describe('selectors', () => {
         url: 'https://remix.ethereum.org/',
       },
       metamask: {
-        identities: {
-          '0x7250739de134d33ec7ab1ee592711e15098c9d2d': {
-            address: '0x7250739de134d33ec7ab1ee592711e15098c9d2d',
-            name: 'Really Long Name That Should Be Truncated',
-          },
-          '0x8e5d75d60224ea0c33d0041e75de68b1c3cb6dd5': {
-            address: '0x8e5d75d60224ea0c33d0041e75de68b1c3cb6dd5',
-            name: 'Account 1',
-          },
-          '0xb3958fb96c8201486ae20be1d5c9f58083df343a': {
-            address: '0xb3958fb96c8201486ae20be1d5c9f58083df343a',
-            name: 'Account 2',
-          },
-        },
         internalAccounts: {
           accounts: {
             'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index f35428860bc3..c17748650bdb 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -6,6 +6,7 @@ import { ApprovalType } from '@metamask/controller-utils';
 import {
   stripSnapPrefix,
   getLocalizedSnapManifest,
+  SnapStatus,
 } from '@metamask/snaps-utils';
 import { memoize } from 'lodash';
 import semver from 'semver';
@@ -13,7 +14,7 @@ import semver from 'semver';
 import { createSelector } from 'reselect';
 import { NameType } from '@metamask/name-controller';
 import { TransactionStatus } from '@metamask/transaction-controller';
-import { addHexPrefix } from '../../app/scripts/lib/util';
+import { addHexPrefix, getEnvironmentType } from '../../app/scripts/lib/util';
 import {
   TEST_CHAINS,
   BUYABLE_CHAINS_MAP,
@@ -31,7 +32,6 @@ import {
   LINEA_GOERLI_DISPLAY_NAME,
   CURRENCY_SYMBOLS,
   TEST_NETWORK_TICKER_MAP,
-  LINEA_GOERLI_TOKEN_IMAGE_URL,
   LINEA_MAINNET_DISPLAY_NAME,
   LINEA_MAINNET_TOKEN_IMAGE_URL,
   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
@@ -42,6 +42,13 @@ import {
   CHAIN_ID_TOKEN_IMAGE_MAP,
   LINEA_SEPOLIA_TOKEN_IMAGE_URL,
   LINEA_SEPOLIA_DISPLAY_NAME,
+  CRONOS_DISPLAY_NAME,
+  CELO_DISPLAY_NAME,
+  GNOSIS_DISPLAY_NAME,
+  FANTOM_DISPLAY_NAME,
+  POLYGON_ZKEVM_DISPLAY_NAME,
+  MOONBEAM_DISPLAY_NAME,
+  MOONRIVER_DISPLAY_NAME,
 } from '../../shared/constants/network';
 import {
   WebHIDConnectedStatuses,
@@ -49,6 +56,7 @@ import {
   HardwareTransportStates,
 } from '../../shared/constants/hardware-wallets';
 import { KeyringType } from '../../shared/constants/keyring';
+import { getIsSmartTransaction } from '../../shared/modules/selectors';
 
 import { TRUNCATED_NAME_CHAR_LIMIT } from '../../shared/constants/labels';
 
@@ -77,6 +85,7 @@ import {
   isEIP1559Network,
   getLedgerTransportType,
   isAddressLedger,
+  getIsUnlocked,
 } from '../ducks/metamask/metamask';
 import {
   getLedgerWebHidConnectedStatus,
@@ -105,6 +114,7 @@ import {
   SURVEY_START_TIME,
 } from '../helpers/constants/survey';
 import { SUPPORTED_CHAIN_IDS } from '../../app/scripts/lib/ppom/ppom-middleware';
+import { ENVIRONMENT_TYPE_POPUP } from '../../shared/constants/app';
 import {
   getCurrentNetworkTransactions,
   getUnapprovedTransactions,
@@ -116,6 +126,7 @@ import {
   getConnectedSubjectsForAllAddresses,
   ///: END:ONLY_INCLUDE_IF
   getOrderedConnectedAccountsForActiveTab,
+  getOrderedConnectedAccountsForConnectedDapp,
 } from './permissions';
 import { createDeepEqualSelector } from './util';
 
@@ -308,28 +319,14 @@ export const getMetaMaskAccounts = createSelector(
       };
     }, {}),
 );
-
 /**
- * Returns the selected address from the Metamask state.
+ * Returns the address of the selected InternalAccount from the Metamask state.
  *
  * @param state - The Metamask state object.
  * @returns {string} The selected address.
  */
 export function getSelectedAddress(state) {
-  return state.metamask.selectedAddress;
-}
-
-/**
- * Returns the selected identity from the Metamask state.
- *
- * @param state - The Metamask state object.
- * @returns The selected identity object.
- */
-export function getSelectedIdentity(state) {
-  const selectedAddress = getSelectedAddress(state);
-  const { identities } = state.metamask;
-
-  return identities[selectedAddress];
+  return getSelectedInternalAccount(state)?.address;
 }
 
 export function getInternalAccountByAddress(state, address) {
@@ -400,16 +397,6 @@ export function getMetaMaskKeyrings(state) {
   return state.metamask.keyrings;
 }
 
-/**
- * Get identity state.
- *
- * @param {object} state - Redux state
- * @returns {object} A map of account addresses to identities (which includes the account name)
- */
-export function getMetaMaskIdentities(state) {
-  return state.metamask.identities;
-}
-
 /**
  * Get account balances state.
  *
@@ -436,7 +423,7 @@ export function getMetaMaskCachedBalances(state) {
 }
 
 /**
- * Get ordered (by keyrings) accounts with identity and balance
+ * Get ordered (by keyrings) accounts with InternalAccount and balance
  */
 export const getMetaMaskAccountsOrdered = createSelector(
   getInternalAccountsSortedByKeyring,
@@ -475,6 +462,12 @@ export function getAllTokens(state) {
   return state.metamask.allTokens;
 }
 
+/**
+ * Selector to return an origin to network ID map
+ *
+ * @param state - Redux state object.
+ * @returns Object - Installed Snaps.
+ */
 export function getAllDomains(state) {
   return state.metamask.domains;
 }
@@ -555,8 +548,8 @@ export function getAccountName(accounts, accountAddress) {
 
 export function getMetadataContractName(state, address) {
   const tokenList = getTokenList(state);
-  const entry = Object.values(tokenList).find((identity) =>
-    isEqualCaseInsensitive(identity.address, address),
+  const entry = Object.values(tokenList).find((token) =>
+    isEqualCaseInsensitive(token.address, address),
   );
   return entry && entry.name !== '' ? entry.name : '';
 }
@@ -617,6 +610,134 @@ export function getGasIsLoading(state) {
   return state.appState.gasIsLoading;
 }
 
+/**
+ * Retrieves user preference to never see the "Switched Network" toast
+ *
+ * @param state - Redux state object.
+ * @returns Boolean preference value
+ */
+export function getNeverShowSwitchedNetworkMessage(state) {
+  return state.metamask.switchedNetworkNeverShowMessage;
+}
+
+export const getNonTestNetworks = createDeepEqualSelector(
+  getNetworkConfigurations,
+  (networkConfigurations = {}) => {
+    return [
+      // Mainnet always first
+      {
+        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,
+        ticker: CURRENCY_SYMBOLS.ETH,
+        id: NETWORK_TYPES.MAINNET,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_MAINNET,
+        nickname: LINEA_MAINNET_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_MAINNET],
+        rpcPrefs: {
+          imageUrl: LINEA_MAINNET_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_MAINNET,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_MAINNET],
+        id: NETWORK_TYPES.LINEA_MAINNET,
+        removable: false,
+      },
+      // Custom networks added by the user
+      ...Object.values(networkConfigurations)
+        .filter(({ chainId }) => ![CHAIN_IDS.LOCALHOST].includes(chainId))
+        .map((network) => ({
+          ...network,
+          rpcPrefs: {
+            ...network.rpcPrefs,
+            // Provide an image based on chainID if a network
+            // has been added without an image
+            imageUrl:
+              network?.rpcPrefs?.imageUrl ??
+              CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[network.chainId],
+          },
+          removable: true,
+        })),
+    ];
+  },
+);
+
+export const getTestNetworks = createDeepEqualSelector(
+  getNetworkConfigurations,
+  (networkConfigurations = {}) => {
+    return [
+      {
+        chainId: CHAIN_IDS.SEPOLIA,
+        nickname: SEPOLIA_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.SEPOLIA],
+        providerType: NETWORK_TYPES.SEPOLIA,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
+        id: NETWORK_TYPES.SEPOLIA,
+        removable: false,
+      },
+      {
+        chainId: CHAIN_IDS.LINEA_SEPOLIA,
+        nickname: LINEA_SEPOLIA_DISPLAY_NAME,
+        rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
+        rpcPrefs: {
+          imageUrl: LINEA_SEPOLIA_TOKEN_IMAGE_URL,
+        },
+        providerType: NETWORK_TYPES.LINEA_SEPOLIA,
+        ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
+        id: NETWORK_TYPES.LINEA_SEPOLIA,
+        removable: false,
+      },
+      // Localhosts
+      ...Object.values(networkConfigurations)
+        .filter(({ chainId }) => chainId === CHAIN_IDS.LOCALHOST)
+        .map((network) => ({ ...network, removable: true })),
+    ];
+  },
+);
+
+export const getAllNetworks = createDeepEqualSelector(
+  getNonTestNetworks,
+  getTestNetworks,
+  (nonTestNetworks, testNetworks) => {
+    return [
+      // Mainnet and custom networks
+      ...nonTestNetworks,
+      // Test networks
+      ...testNetworks,
+    ];
+  },
+);
+
+/**
+ * Provides information about the last network change if present
+ *
+ * @param state - Redux state object.
+ * @returns An object with information about the network with the given networkClientId
+ */
+export function getSwitchedNetworkDetails(state) {
+  const { switchedNetworkDetails } = state.metamask;
+  const allNetworks = getAllNetworks(state);
+
+  if (switchedNetworkDetails) {
+    const switchedNetwork = allNetworks.find(
+      ({ id }) => switchedNetworkDetails.networkClientId === id,
+    );
+    return {
+      nickname: switchedNetwork?.nickname,
+      imageUrl: switchedNetwork?.rpcPrefs?.imageUrl,
+      origin: switchedNetworkDetails?.origin,
+    };
+  }
+
+  return null;
+}
+
 export function getAppIsLoading(state) {
   return state.appState.isLoading;
 }
@@ -736,6 +857,16 @@ export function getPetnamesEnabled(state) {
   return petnamesEnabled;
 }
 
+export function getRedesignedConfirmationsEnabled(state) {
+  const { redesignedConfirmationsEnabled } = getPreferences(state);
+  return redesignedConfirmationsEnabled;
+}
+
+export function getFeatureNotificationsEnabled(state) {
+  const { featureNotificationsEnabled = false } = getPreferences(state);
+  return featureNotificationsEnabled;
+}
+
 export function getShowExtensionInFullSizeView(state) {
   const { showExtensionInFullSizeView } = getPreferences(state);
   return Boolean(showExtensionInFullSizeView);
@@ -781,7 +912,8 @@ export function getAdvancedInlineGasShown(state) {
 }
 
 export function getUseNonceField(state) {
-  return Boolean(state.metamask.useNonceField);
+  const isSmartTransaction = getIsSmartTransaction(state);
+  return Boolean(!isSmartTransaction && state.metamask.useNonceField);
 }
 
 export function getCustomNonceValue(state) {
@@ -1040,6 +1172,10 @@ export function getIpfsGateway(state) {
   return state.metamask.ipfsGateway;
 }
 
+export function getUseExternalServices(state) {
+  return state.metamask.useExternalServices;
+}
+
 export function getInfuraBlocked(state) {
   return (
     state.metamask.networksMetadata[getSelectedNetworkClientId(state)]
@@ -1139,17 +1275,6 @@ export function getShowWhatsNewPopup(state) {
   return state.appState.showWhatsNewPopup;
 }
 
-/**
- * Returns a memoized version of the MetaMask identities.
- *
- * @param state - The Redux state.
- * @returns {Array} An array of MetaMask identities.
- */
-export const getMemoizedMetaMaskIdentities = createDeepEqualSelector(
-  getMetaMaskIdentities,
-  (identities) => identities,
-);
-
 /**
  * Returns a memoized selector that gets the internal accounts from the Redux store.
  *
@@ -1277,23 +1402,28 @@ export const getAllConnectedAccounts = createDeepEqualSelector(
 );
 export const getConnectedSitesList = createDeepEqualSelector(
   getConnectedSubjectsForAllAddresses,
-  getMetaMaskIdentities,
+  getInternalAccounts,
   getAllConnectedAccounts,
-  (connectedSubjectsForAllAddresses, identities, connectedAddresses) => {
+  (connectedSubjectsForAllAddresses, internalAccounts, connectedAddresses) => {
     const sitesList = {};
     connectedAddresses.forEach((connectedAddress) => {
       connectedSubjectsForAllAddresses[connectedAddress].forEach((app) => {
         const siteKey = app.origin;
+
+        const internalAccount = internalAccounts.find((account) =>
+          isEqualCaseInsensitive(account.address, connectedAddress),
+        );
+
         if (sitesList[siteKey]) {
           sitesList[siteKey].addresses.push(connectedAddress);
           sitesList[siteKey].addressToNameMap[connectedAddress] =
-            identities[connectedAddress].name; // Map address to name
+            internalAccount?.metadata.name || ''; // Map address to name
         } else {
           sitesList[siteKey] = {
             ...app,
             addresses: [connectedAddress],
             addressToNameMap: {
-              [connectedAddress]: identities[connectedAddress].name,
+              [connectedAddress]: internalAccount?.metadata.name || '',
             },
           };
         }
@@ -1312,7 +1442,9 @@ export const getConnectedSitesListWithNetworkInfo = createDeepEqualSelector(
       const connectedNetwork = networks.find(
         (network) => network.id === domains[siteKey],
       );
-      sitesList[siteKey].networkIconUrl = connectedNetwork.rpcPrefs.imageUrl;
+      // For the testnets, if we do not have an image, we will have a fallback string
+      sitesList[siteKey].networkIconUrl =
+        connectedNetwork.rpcPrefs?.imageUrl || '';
       sitesList[siteKey].networkName = connectedNetwork.nickname;
     });
     return sitesList;
@@ -1364,6 +1496,10 @@ export function getSnaps(state) {
   return state.metamask.snaps;
 }
 
+export function getLocale(state) {
+  return state.metamask.currentLocale;
+}
+
 export const getSnap = createDeepEqualSelector(
   getSnaps,
   (_, snapId) => snapId,
@@ -1373,25 +1509,31 @@ export const getSnap = createDeepEqualSelector(
 );
 
 /**
- * Get a selector that returns the snap manifest for a given `snapId`.
+ * Get a selector that returns all Snaps metadata (name and description) for all Snaps.
  *
  * @param {object} state - The Redux state object.
- * @param {string} snapId - The snap ID to get the manifest for.
- * @returns {object | undefined} The snap manifest.
- */
-export const getSnapManifest = createDeepEqualSelector(
-  (state) => state.metamask.currentLocale,
-  (state, snapId) => getSnap(state, snapId),
-  (locale, snap) => {
-    if (!snap?.localizationFiles) {
-      return snap?.manifest;
-    }
-
-    return getLocalizedSnapManifest(
-      snap.manifest,
-      locale,
-      snap.localizationFiles,
-    );
+ * @returns {object} An object mapping all installed snaps to their metadata, which contains the snap name and description.
+ */
+export const getSnapsMetadata = createDeepEqualSelector(
+  getLocale,
+  getSnaps,
+  (locale, snaps) => {
+    return Object.values(snaps).reduce((snapsMetadata, snap) => {
+      const snapId = snap.id;
+      const manifest = snap.localizationFiles
+        ? getLocalizedSnapManifest(
+            snap.manifest,
+            locale,
+            snap.localizationFiles,
+          )
+        : snap.manifest;
+
+      snapsMetadata[snapId] = {
+        name: manifest.proposedName,
+        description: manifest.description,
+      };
+      return snapsMetadata;
+    }, {});
   },
 );
 
@@ -1404,35 +1546,14 @@ export const getSnapManifest = createDeepEqualSelector(
  * @returns {object} An object containing the snap name and description.
  */
 export const getSnapMetadata = createDeepEqualSelector(
-  (state, snapId) => getSnapManifest(state, snapId),
+  getSnapsMetadata,
   (_, snapId) => snapId,
-  (manifest, snapId) => {
-    return {
-      // The snap manifest may not be available if the Snap is not installed, so
-      // we use the snap ID as the name in that case.
-      name: manifest?.proposedName ?? (snapId ? stripSnapPrefix(snapId) : null),
-      description: manifest?.description,
-    };
-  },
-);
-
-/**
- * Get a selector that returns all snaps metadata (name and description) for a
- * given `snapId`.
- *
- * @param {object} state - The Redux state object.
- * @returns {object} An object mapping all installed snaps to their metadata, which contains the snap name and description.
- */
-export const getSnapsMetadata = createDeepEqualSelector(
-  (state) => state,
-  (state) => {
-    return Object.keys(getSnaps(state));
-  },
-  (state, snapIds) => {
-    return snapIds.reduce((snapsMetadata, snapId) => {
-      snapsMetadata[snapId] = getSnapMetadata(state, snapId);
-      return snapsMetadata;
-    }, {});
+  (metadata, snapId) => {
+    return (
+      metadata[snapId] ?? {
+        name: snapId ? stripSnapPrefix(snapId) : null,
+      }
+    );
   },
 );
 
@@ -1626,6 +1747,78 @@ export function getShowRecoveryPhraseReminder(state) {
   return currentTime - recoveryPhraseReminderLastShown >= frequency;
 }
 
+/**
+ * Retrieves the number of unapproved transactions and messages
+ *
+ * @param state - Redux state object.
+ * @returns Number of unapproved transactions
+ */
+export function getNumberOfAllUnapprovedTransactionsAndMessages(state) {
+  const unapprovedTxs = getUnapprovedTransactions(state);
+  const allUnapprovedMessages = {
+    ...unapprovedTxs,
+    ...state.metamask.unapprovedMsgs,
+    ...state.metamask.unapprovedDecryptMsgs,
+    ...state.metamask.unapprovedPersonalMsgs,
+    ...state.metamask.unapprovedEncryptionPublicKeyMsgs,
+    ...state.metamask.unapprovedTypedMessages,
+  };
+  const numUnapprovedMessages = Object.keys(allUnapprovedMessages).length;
+  return numUnapprovedMessages;
+}
+
+export const getCurrentNetwork = createDeepEqualSelector(
+  getAllNetworks,
+  getProviderConfig,
+  (allNetworks, providerConfig) => {
+    const filter =
+      providerConfig.type === 'rpc'
+        ? (network) => network.id === providerConfig.id
+        : (network) => network.id === providerConfig.type;
+    return allNetworks.find(filter);
+  },
+);
+
+/**
+ * Returns the network client ID of the network that should be auto-switched to
+ * based on the current tab origin and its last network connected to
+ *
+ * @param state - Redux state object.
+ * @returns Network ID to switch to
+ */
+export function getNetworkToAutomaticallySwitchTo(state) {
+  const numberOfUnapprovedTx =
+    getNumberOfAllUnapprovedTransactionsAndMessages(state);
+
+  // This block autoswitches chains based on the last chain used
+  // for a given dapp, when there are no pending confimrations
+  // This allows the user to be connected on one chain
+  // for one dapp, and automatically change for another
+  const selectedTabOrigin = getOriginOfCurrentTab(state);
+  const useRequestQueue = getUseRequestQueue(state);
+  if (
+    getEnvironmentType() === ENVIRONMENT_TYPE_POPUP &&
+    getIsUnlocked(state) &&
+    useRequestQueue &&
+    selectedTabOrigin &&
+    numberOfUnapprovedTx === 0
+  ) {
+    const domainNetworks = getAllDomains(state);
+    const networkIdForThisDomain = domainNetworks[selectedTabOrigin];
+    const currentNetwork = getCurrentNetwork(state);
+
+    // If we have a match, "silently" switch networks if the network differs
+    // from the current network
+    if (
+      networkIdForThisDomain &&
+      currentNetwork.id !== networkIdForThisDomain
+    ) {
+      return networkIdForThisDomain;
+    }
+  }
+  return null;
+}
+
 export function getShowTermsOfUse(state) {
   const { termsOfUseLastAgreed } = state.metamask;
 
@@ -1663,10 +1856,6 @@ export function getShowPermissionsTour(state) {
   return state.metamask.showPermissionsTour;
 }
 
-export function getShowProductTour(state) {
-  return state.metamask.showProductTour;
-}
-
 export function getShowNetworkBanner(state) {
   return state.metamask.showNetworkBanner;
 }
@@ -1786,17 +1975,6 @@ export function getNetworkConfigurations(state) {
   return state.metamask.networkConfigurations;
 }
 
-export function getCurrentNetwork(state) {
-  const allNetworks = getAllNetworks(state);
-  const providerConfig = getProviderConfig(state);
-
-  const filter =
-    providerConfig.type === 'rpc'
-      ? (network) => network.id === providerConfig.id
-      : (network) => network.id === providerConfig.type;
-  return allNetworks.find(filter);
-}
-
 export function getIsNetworkSupportedByBlockaid(state) {
   const currentChainId = getCurrentChainId(state);
   const isSupported = SUPPORTED_CHAIN_IDS.includes(currentChainId);
@@ -1804,145 +1982,14 @@ export function getIsNetworkSupportedByBlockaid(state) {
   return isSupported;
 }
 
-export function getAllEnabledNetworks(state) {
-  const nonTestNetworks = getNonTestNetworks(state);
-  const allNetworks = getAllNetworks(state);
-  const showTestnetNetworks = getShowTestNetworks(state);
-
-  return showTestnetNetworks ? allNetworks : nonTestNetworks;
-}
-
-export function getTestNetworks(state) {
-  const networkConfigurations = getNetworkConfigurations(state) || {};
-
-  return [
-    {
-      chainId: CHAIN_IDS.SEPOLIA,
-      nickname: SEPOLIA_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.SEPOLIA],
-      providerType: NETWORK_TYPES.SEPOLIA,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
-      id: NETWORK_TYPES.SEPOLIA,
-      removable: false,
-    },
-    {
-      chainId: CHAIN_IDS.LINEA_GOERLI,
-      nickname: LINEA_GOERLI_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_GOERLI],
-      rpcPrefs: {
-        imageUrl: LINEA_GOERLI_TOKEN_IMAGE_URL,
-      },
-      providerType: NETWORK_TYPES.LINEA_GOERLI,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_GOERLI],
-      id: NETWORK_TYPES.LINEA_GOERLI,
-      removable: false,
-    },
-    {
-      chainId: CHAIN_IDS.LINEA_SEPOLIA,
-      nickname: LINEA_SEPOLIA_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_SEPOLIA],
-      rpcPrefs: {
-        imageUrl: LINEA_SEPOLIA_TOKEN_IMAGE_URL,
-      },
-      providerType: NETWORK_TYPES.LINEA_SEPOLIA,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_SEPOLIA],
-      id: NETWORK_TYPES.LINEA_SEPOLIA,
-      removable: false,
-    },
-    // Localhosts
-    ...Object.values(networkConfigurations)
-      .filter(({ chainId }) => chainId === CHAIN_IDS.LOCALHOST)
-      .map((network) => ({ ...network, removable: true })),
-  ];
-}
-
-export function getNonTestNetworks(state) {
-  const networkConfigurations = getNetworkConfigurations(state) || {};
-
-  return [
-    // Mainnet always first
-    {
-      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,
-      ticker: CURRENCY_SYMBOLS.ETH,
-      id: NETWORK_TYPES.MAINNET,
-      removable: false,
-    },
-    {
-      chainId: CHAIN_IDS.LINEA_MAINNET,
-      nickname: LINEA_MAINNET_DISPLAY_NAME,
-      rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_MAINNET],
-      rpcPrefs: {
-        imageUrl: LINEA_MAINNET_TOKEN_IMAGE_URL,
-      },
-      providerType: NETWORK_TYPES.LINEA_MAINNET,
-      ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_MAINNET],
-      id: NETWORK_TYPES.LINEA_MAINNET,
-      removable: false,
-    },
-    // Custom networks added by the user
-    ...Object.values(networkConfigurations)
-      .filter(({ chainId }) => ![CHAIN_IDS.LOCALHOST].includes(chainId))
-      .map((network) => ({
-        ...network,
-        rpcPrefs: {
-          ...network.rpcPrefs,
-          // Provide an image based on chainID if a network
-          // has been added without an image
-          imageUrl:
-            network?.rpcPrefs?.imageUrl ??
-            CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[network.chainId],
-        },
-        removable: true,
-      })),
-  ];
-}
-
-export function getAllNetworks(state) {
-  const networks = [
-    // Mainnet and custom networks
-    ...getNonTestNetworks(state),
-    // Test networks
-    ...getTestNetworks(state),
-  ];
-
-  return networks;
-}
-
-export function getIsOptimism(state) {
-  return (
-    getCurrentChainId(state) === CHAIN_IDS.OPTIMISM ||
-    getCurrentChainId(state) === CHAIN_IDS.OPTIMISM_TESTNET ||
-    getCurrentChainId(state) === CHAIN_IDS.OPTIMISM_GOERLI
-  );
-}
-
-export function getIsBase(state) {
-  return (
-    getCurrentChainId(state) === CHAIN_IDS.BASE ||
-    getCurrentChainId(state) === CHAIN_IDS.BASE_TESTNET
-  );
-}
-
-export function getIsOpbnb(state) {
-  return (
-    getCurrentChainId(state) === CHAIN_IDS.OPBNB ||
-    getCurrentChainId(state) === CHAIN_IDS.OPBNB_TESTNET
-  );
-}
-
-export function getIsOpStack(state) {
-  return getIsOptimism(state) || getIsBase(state) || getIsOpbnb(state);
-}
-
-export function getIsMultiLayerFeeNetwork(state) {
-  return getIsOpStack(state);
-}
+export const getAllEnabledNetworks = createDeepEqualSelector(
+  getNonTestNetworks,
+  getAllNetworks,
+  getShowTestNetworks,
+  (nonTestNetworks, allNetworks, showTestnetNetworks) => {
+    return showTestnetNetworks ? allNetworks : nonTestNetworks;
+  },
+);
 
 /**
  *  To retrieve the maxBaseFee and priorityFee the user has set as default
@@ -2001,14 +2048,26 @@ export const getTokenDetectionSupportNetworkByChainId = (state) => {
       return BASE_DISPLAY_NAME;
     case CHAIN_IDS.ZKSYNC_ERA:
       return ZK_SYNC_ERA_DISPLAY_NAME;
+    case CHAIN_IDS.CRONOS:
+      return CRONOS_DISPLAY_NAME;
+    case CHAIN_IDS.CELO:
+      return CELO_DISPLAY_NAME;
+    case CHAIN_IDS.GNOSIS:
+      return GNOSIS_DISPLAY_NAME;
+    case CHAIN_IDS.FANTOM:
+      return FANTOM_DISPLAY_NAME;
+    case CHAIN_IDS.POLYGON_ZKEVM:
+      return POLYGON_ZKEVM_DISPLAY_NAME;
+    case CHAIN_IDS.MOONBEAM:
+      return MOONBEAM_DISPLAY_NAME;
+    case CHAIN_IDS.MOONRIVER:
+      return MOONRIVER_DISPLAY_NAME;
     default:
       return '';
   }
 };
 /**
- * To check if the chainId supports token detection,
- * currently it returns true for Ethereum Mainnet, BSC, Polygon,
- * Avalanche, Linea, Arbitrum, Optimism, Base, and zkSync
+ * Returns true if a token list is available for the current network.
  *
  * @param {*} state
  * @returns Boolean
@@ -2027,6 +2086,13 @@ export function getIsDynamicTokenListAvailable(state) {
     CHAIN_IDS.OPTIMISM,
     CHAIN_IDS.BASE,
     CHAIN_IDS.ZKSYNC_ERA,
+    CHAIN_IDS.CRONOS,
+    CHAIN_IDS.CELO,
+    CHAIN_IDS.GNOSIS,
+    CHAIN_IDS.FANTOM,
+    CHAIN_IDS.POLYGON_ZKEVM,
+    CHAIN_IDS.MOONBEAM,
+    CHAIN_IDS.MOONRIVER,
   ].includes(chainId);
 }
 
@@ -2211,9 +2277,12 @@ export function getCustomTokenAmount(state) {
   return state.appState.customTokenAmount;
 }
 
-export function getUnconnectedAccounts(state) {
+export function getUnconnectedAccounts(state, activeTab) {
   const accounts = getMetaMaskAccountsOrdered(state);
-  const connectedAccounts = getOrderedConnectedAccountsForActiveTab(state);
+  const connectedAccounts = getOrderedConnectedAccountsForConnectedDapp(
+    state,
+    activeTab,
+  );
   const unConnectedAccounts = accounts.filter((account) => {
     return !connectedAccounts.some(
       (connectedAccount) => connectedAccount.address === account.address,
@@ -2228,17 +2297,37 @@ export function getUpdatedAndSortedAccounts(state) {
   const hiddenAddresses = getHiddenAccountsList(state);
   const connectedAccounts = getOrderedConnectedAccountsForActiveTab(state);
 
+  connectedAccounts.forEach((connection) => {
+    // Find if the connection exists in accounts
+    const matchingAccount = accounts.find(
+      (account) => account.id === connection.id,
+    );
+
+    // If a matching account is found and the connection has metadata, add the connections property to true and lastSelected timestamp from metadata
+    if (matchingAccount && connection.metadata) {
+      matchingAccount.connections = true;
+      matchingAccount.lastSelected = connection.metadata.lastSelected;
+    }
+  });
+
+  // Find the account with the most recent lastSelected timestamp among accounts with metadata
+  const accountsWithLastSelected = accounts.filter(
+    (account) => account.connections && account.lastSelected,
+  );
+
+  const mostRecentAccount =
+    accountsWithLastSelected.length > 0
+      ? accountsWithLastSelected.reduce((prev, current) => {
+          return prev.lastSelected > current.lastSelected ? prev : current;
+        })
+      : null;
+
   accounts.forEach((account) => {
     account.pinned = Boolean(pinnedAddresses.includes(account.address));
     account.hidden = Boolean(hiddenAddresses.includes(account.address));
-    if (
-      connectedAccounts.length > 0 &&
-      account.address === connectedAccounts[0].address
-    ) {
-      // Update the active property of the matched account to true
+    if (mostRecentAccount && account.id === mostRecentAccount.id) {
       account.active = true;
     } else {
-      // If not the first element or no match found, set active to false
       account.active = false;
     }
   });
@@ -2276,6 +2365,14 @@ export function getOnboardedInThisUISession(state) {
   return state.appState.onboardedInThisUISession;
 }
 
+export function getShowBasicFunctionalityModal(state) {
+  return state.appState.showBasicFunctionalityModal;
+}
+
+export function getExternalServicesOnboardingToggleState(state) {
+  return state.appState.externalServicesOnboardingToggleState;
+}
+
 export const useSafeChainsListValidationSelector = (state) => {
   return state.metamask.useSafeChainsListValidation;
 };
@@ -2337,7 +2434,10 @@ export function getIsDesktopEnabled(state) {
 export function getSnapsList(state) {
   const snaps = getSnaps(state);
   return Object.entries(snaps)
-    .filter(([_key, snap]) => !snap.preinstalled)
+    .filter(
+      ([_key, snap]) =>
+        !snap.preinstalled && snap.status !== SnapStatus.Installing,
+    )
     .map(([key, snap]) => {
       const targetSubjectMetadata = getTargetSubjectMetadata(state, snap?.id);
       return {
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index f1cd6409b22e..d32fe8ee6fe4 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -1,6 +1,7 @@
 import { deepClone } from '@metamask/snaps-utils';
 import { ApprovalType, NetworkType } from '@metamask/controller-utils';
 import { EthAccountType, EthMethod } from '@metamask/keyring-api';
+import { TransactionStatus } from '@metamask/transaction-controller';
 import mockState from '../../test/data/mock-state.json';
 import { KeyringType } from '../../shared/constants/keyring';
 import {
@@ -10,8 +11,14 @@ import {
   OPTIMISM_DISPLAY_NAME,
 } from '../../shared/constants/network';
 import { SURVEY_DATE, SURVEY_GMT } from '../helpers/constants/survey';
+import { createMockInternalAccount } from '../../test/jest/mocks';
 import * as selectors from './selectors';
 
+jest.mock('../../app/scripts/lib/util', () => ({
+  ...jest.requireActual('../../app/scripts/lib/util'),
+  getEnvironmentType: jest.fn().mockReturnValue('popup'),
+}));
+
 jest.mock('../../shared/modules/network.utils', () => {
   const actual = jest.requireActual('../../shared/modules/network.utils');
   return {
@@ -32,14 +39,25 @@ const modifyStateWithHWKeyring = (keyring) => {
 describe('Selectors', () => {
   describe('#getSelectedAddress', () => {
     it('returns undefined if selectedAddress is undefined', () => {
-      expect(selectors.getSelectedAddress({ metamask: {} })).toBeUndefined();
+      expect(
+        selectors.getSelectedAddress({
+          metamask: { internalAccounts: { accounts: {}, selectedAccount: '' } },
+        }),
+      ).toBeUndefined();
     });
 
     it('returns selectedAddress', () => {
-      const selectedAddress = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+      const mockInternalAccount = createMockInternalAccount();
+      const internalAccounts = {
+        accounts: {
+          [mockInternalAccount.id]: mockInternalAccount,
+        },
+        selectedAccount: mockInternalAccount.id,
+      };
+
       expect(
-        selectors.getSelectedAddress({ metamask: { selectedAddress } }),
-      ).toStrictEqual(selectedAddress);
+        selectors.getSelectedAddress({ metamask: { internalAccounts } }),
+      ).toStrictEqual(mockInternalAccount.address);
     });
   });
 
@@ -150,6 +168,154 @@ describe('Selectors', () => {
     });
   });
 
+  describe('#getNeverShowSwitchedNetworkMessage', () => {
+    it('returns the correct value', () => {
+      expect(
+        selectors.getNeverShowSwitchedNetworkMessage({
+          metamask: { switchedNetworkNeverShowMessage: true },
+        }),
+      ).toStrictEqual(true);
+    });
+  });
+
+  describe('#getSwitchedNetworkDetails', () => {
+    it('returns no details when switchedNetworkDetails is empty', () => {
+      expect(
+        selectors.getSwitchedNetworkDetails({
+          metamask: { switchedNetworkDetails: undefined },
+        }),
+      ).toStrictEqual(null);
+    });
+
+    it('returns network information when valid switchedNetworkDetails are present', () => {
+      const origin = 'portfolio.metamask.io';
+
+      expect(
+        selectors.getSwitchedNetworkDetails({
+          ...mockState,
+          metamask: {
+            ...mockState.metamask,
+            switchedNetworkDetails: {
+              networkClientId:
+                mockState.metamask.networkConfigurations
+                  .testNetworkConfigurationId.id,
+              origin,
+            },
+          },
+        }),
+      ).toStrictEqual({
+        imageUrl: './images/eth_logo.svg',
+        nickname:
+          mockState.metamask.networkConfigurations.testNetworkConfigurationId
+            .nickname,
+        origin,
+      });
+    });
+  });
+
+  describe('#getNumberOfAllUnapprovedTransactionsAndMessages', () => {
+    it('returns no unapproved transactions and messages', () => {
+      expect(
+        selectors.getNumberOfAllUnapprovedTransactionsAndMessages({
+          metamask: {
+            transactions: [],
+            unapprovedMsgs: {},
+          },
+        }),
+      ).toStrictEqual(0);
+    });
+
+    it('returns correct number of unapproved transactions and messages', () => {
+      expect(
+        selectors.getNumberOfAllUnapprovedTransactionsAndMessages({
+          metamask: {
+            providerConfig: {
+              ...mockState.metamask.networkConfigurations
+                .testNetworkConfigurationId,
+              chainId: '0x1',
+              type: 'rpc',
+            },
+            transactions: [
+              {
+                id: 0,
+                chainId: CHAIN_IDS.MAINNET,
+                time: 0,
+                txParams: {
+                  from: '0xAddress',
+                  to: '0xRecipient',
+                },
+                status: TransactionStatus.unapproved,
+              },
+            ],
+            unapprovedMsgs: {
+              1: {
+                id: 1,
+                msgParams: {
+                  from: '0xAddress',
+                  data: '0xData',
+                  origin: 'origin',
+                },
+                time: 1,
+                status: TransactionStatus.unapproved,
+                type: 'eth_sign',
+              },
+            },
+          },
+        }),
+      ).toStrictEqual(2);
+    });
+  });
+
+  describe('#getNetworkToAutomaticallySwitchTo', () => {
+    const SELECTED_ORIGIN = 'https://portfolio.metamask.io';
+    const SELECTED_ORIGIN_NETWORK_ID = NETWORK_TYPES.LINEA_SEPOLIA;
+    const state = {
+      activeTab: {
+        origin: SELECTED_ORIGIN,
+      },
+      metamask: {
+        isUnlocked: true,
+        useRequestQueue: true,
+        selectedTabOrigin: SELECTED_ORIGIN,
+        unapprovedMsgs: [],
+        unapprovedDecryptMsgs: [],
+        unapprovedPersonalMsgs: [],
+        unapprovedEncryptionPublicKeyMsgs: [],
+        unapprovedTypedMessages: [],
+        domains: {
+          [SELECTED_ORIGIN]: SELECTED_ORIGIN_NETWORK_ID,
+        },
+        providerConfig: {
+          ...mockState.metamask.networkConfigurations
+            .testNetworkConfigurationId,
+          chainId: '0x1',
+          type: 'rpc',
+          id: 'mainnet',
+        },
+      },
+    };
+
+    it('should return the network to switch to', () => {
+      const networkToSwitchTo =
+        selectors.getNetworkToAutomaticallySwitchTo(state);
+      expect(networkToSwitchTo).toBe(SELECTED_ORIGIN_NETWORK_ID);
+    });
+
+    it('should return no network to switch to because we are already on it', () => {
+      const networkToSwitchTo = selectors.getNetworkToAutomaticallySwitchTo({
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            id: NETWORK_TYPES.LINEA_SEPOLIA,
+          },
+        },
+      });
+      expect(networkToSwitchTo).toBe(null);
+    });
+  });
+
   describe('#getSuggestedTokens', () => {
     it('returns an empty array if pendingApprovals is undefined', () => {
       expect(selectors.getSuggestedTokens({ metamask: {} })).toStrictEqual([]);
@@ -628,10 +794,26 @@ describe('Selectors', () => {
     });
   });
 
-  it('returns selected identity', () => {
-    expect(selectors.getSelectedIdentity(mockState)).toStrictEqual({
+  it('returns selected internalAccount', () => {
+    expect(selectors.getSelectedInternalAccount(mockState)).toStrictEqual({
       address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-      name: 'Test Account',
+      id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
+      metadata: {
+        name: 'Test Account',
+        keyring: {
+          type: 'HD Key Tree',
+        },
+      },
+      options: {},
+      methods: [
+        'personal_sign',
+        'eth_sign',
+        'eth_signTransaction',
+        'eth_signTypedData_v1',
+        'eth_signTypedData_v3',
+        'eth_signTypedData_v4',
+      ],
+      type: 'eip155:eoa',
     });
   });
 
@@ -1199,7 +1381,9 @@ describe('Selectors', () => {
         balance: '0x0',
         pinned: false,
         hidden: false,
-        active: true,
+        active: false,
+        connections: true,
+        lastSelected: undefined,
       },
       {
         address: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
@@ -1433,12 +1617,12 @@ describe('#getConnectedSitesListWithNetworkInfo', () => {
 describe('#getConnectedSitesList', () => {
   it('returns an empty object if there are no connected addresses', () => {
     const connectedSubjectsForAllAddresses = {};
-    const identities = {};
+    const internalAccounts = [];
     const connectedAddresses = [];
 
     const result = selectors.getConnectedSitesList.resultFunc(
       connectedSubjectsForAllAddresses,
-      identities,
+      internalAccounts,
       connectedAddresses,
     );
 
@@ -1456,15 +1640,23 @@ describe('#getConnectedSitesList', () => {
         { origin: 'site3', name: 'Site 3' },
       ],
     };
-    const identities = {
-      '0x123': { name: 'John Doe' },
-      '0x456': { name: 'Jane Smith' },
-    };
+
+    const mockInternalAccount1 = createMockInternalAccount({
+      address: '0x123',
+      name: 'John Doe',
+    });
+    const mockInternalAccount2 = createMockInternalAccount({
+      address: '0x456',
+      name: 'Jane Smith',
+    });
+
+    const internalAccounts = [mockInternalAccount1, mockInternalAccount2];
+
     const connectedAddresses = ['0x123', '0x456'];
 
     const result = selectors.getConnectedSitesList.resultFunc(
       connectedSubjectsForAllAddresses,
-      identities,
+      internalAccounts,
       connectedAddresses,
     );
 
diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
index 5c116b2cd866..4d2d188533e3 100644
--- a/ui/selectors/transactions.js
+++ b/ui/selectors/transactions.js
@@ -97,18 +97,33 @@ export const unapprovedEncryptionPublicKeyMsgsSelector = (state) =>
 export const unapprovedTypedMessagesSelector = (state) =>
   state.metamask.unapprovedTypedMessages;
 
-export const smartTransactionsListSelector = (state) =>
-  state.metamask.smartTransactionsState?.smartTransactions?.[
+export const smartTransactionsListSelector = (state) => {
+  const { address: selectedAddress } = getSelectedInternalAccount(state);
+  return state.metamask.smartTransactionsState?.smartTransactions?.[
     getCurrentChainId(state)
   ]
-    ?.filter((stx) => !stx.confirmed)
+    ?.filter((stx) => {
+      const isCancelledSmartTransaction = stx.status?.startsWith('cancelled');
+      return (
+        stx.txParams?.from === selectedAddress &&
+        !stx.confirmed &&
+        (!isCancelledSmartTransaction ||
+          // We only want to show cancelled Smart Transactions for Swaps in Activity,
+          // since other transaction types will show the "Failed" status in Activity instead,
+          // because they are mostly processed via the TransactionController. In the future, we
+          // should have the same behavior for Swaps as well, so all transaction types
+          // would be handled the same way for Smart Transactions.
+          (isCancelledSmartTransaction && stx.type === TransactionType.swap))
+      );
+    })
     .map((stx) => ({
       ...stx,
-      transactionType: TransactionType.smart,
+      isSmartTransaction: true,
       status: stx.status?.startsWith('cancelled')
         ? SmartTransactionStatus.cancelled
         : stx.status,
     }));
+};
 
 export const selectedAddressTxListSelector = createSelector(
   getSelectedInternalAccount,
diff --git a/ui/selectors/transactions.test.js b/ui/selectors/transactions.test.js
index 16a57a004fe8..88fcbe63a44a 100644
--- a/ui/selectors/transactions.test.js
+++ b/ui/selectors/transactions.test.js
@@ -134,7 +134,6 @@ describe('Transaction Selectors', () => {
             chainId: CHAIN_IDS.MAINNET,
           },
           featureFlags: {},
-          selectedAddress: '0xAddress',
           internalAccounts: {
             accounts: {
               'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -193,7 +192,6 @@ describe('Transaction Selectors', () => {
             chainId: CHAIN_IDS.MAINNET,
           },
           featureFlags: {},
-          selectedAddress: '0xAddress',
           internalAccounts: {
             accounts: {
               'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -283,7 +281,6 @@ describe('Transaction Selectors', () => {
             nickname: 'mainnet',
             chainId: CHAIN_IDS.MAINNET,
           },
-          selectedAddress: '0xAddress',
           internalAccounts: {
             accounts: {
               'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
@@ -387,7 +384,6 @@ describe('Transaction Selectors', () => {
           nickname: 'mainnet',
           chainId: CHAIN_IDS.MAINNET,
         },
-        selectedAddress: '0xAddress',
         internalAccounts: {
           accounts: {
             'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
diff --git a/ui/store/actionConstants.test.js b/ui/store/actionConstants.test.js
index 71a3d5f9c05f..b065b03ea91e 100644
--- a/ui/store/actionConstants.test.js
+++ b/ui/store/actionConstants.test.js
@@ -4,14 +4,9 @@ import * as actionConstants from './actionConstants';
 
 describe('Redux actionConstants', () => {
   describe('SET_ACCOUNT_LABEL', () => {
-    it('updates the state.metamask.identities[:i].name property of the state to the action.value.label', () => {
+    it('updates the metadata.name value of an internal account property of the state to the action.value.label', () => {
       const initialState = {
         metamask: {
-          identities: {
-            foo: {
-              name: 'bar',
-            },
-          },
           internalAccounts: {
             accounts: {
               mockId: {
@@ -51,9 +46,6 @@ describe('Redux actionConstants', () => {
       freeze(action);
 
       const resultingState = reducers(initialState, action);
-      expect(resultingState.metamask.identities.foo.name).toStrictEqual(
-        action.value.label,
-      );
       expect(
         resultingState.metamask.internalAccounts.accounts.mockid.metadata.name,
       ).toStrictEqual(action.value.label);
diff --git a/ui/store/actionConstants.ts b/ui/store/actionConstants.ts
index 51cab06a40c4..d89aa1d1bbb3 100644
--- a/ui/store/actionConstants.ts
+++ b/ui/store/actionConstants.ts
@@ -17,6 +17,14 @@ export const SHOW_IPFS_MODAL_OPEN = 'UI_IPFS_MODAL_OPEN';
 export const SHOW_IPFS_MODAL_CLOSE = 'UI_IPFS_MODAL_CLOSE';
 export const IMPORT_TOKENS_POPOVER_OPEN = 'UI_IMPORT_TOKENS_POPOVER_OPEN';
 export const IMPORT_TOKENS_POPOVER_CLOSE = 'UI_IMPORT_TOKENS_POPOVER_CLOSE';
+export const SHOW_BASIC_FUNCTIONALITY_MODAL_OPEN =
+  'SHOW_BASIC_FUNCTIONALITY_MODAL_OPEN';
+export const SHOW_BASIC_FUNCTIONALITY_MODAL_CLOSE =
+  'SHOW_BASIC_FUNCTIONALITY_MODAL_CLOSE';
+export const ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_ON =
+  'ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_ON';
+export const ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_OFF =
+  'ONBOARDING_TOGGLE_BASIC_FUNCTIONALITY_OFF';
 
 // remote state
 export const UPDATE_METAMASK_STATE = 'UPDATE_METAMASK_STATE';
@@ -75,7 +83,9 @@ export const SET_PARTICIPATE_IN_METAMETRICS = 'SET_PARTICIPATE_IN_METAMETRICS';
 export const SET_CURRENT_LOCALE = 'SET_CURRENT_LOCALE';
 
 // Onboarding
+
 export const COMPLETE_ONBOARDING = 'COMPLETE_ONBOARDING';
+export const RESET_ONBOARDING = 'RESET_ONBOARDING';
 export const ONBOARDED_IN_THIS_UI_SESSION = 'ONBOARDED_IN_THIS_UI_SESSION';
 
 // Ledger
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index eb6935d83ef0..793d72b61a46 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -17,7 +17,6 @@ const middleware = [thunk];
 const defaultState = {
   metamask: {
     currentLocale: 'test',
-    selectedAddress: '0xFirstAddress',
     providerConfig: { chainId: '0x1' },
     accounts: {
       '0xFirstAddress': {
@@ -42,9 +41,6 @@ const defaultState = {
       },
       selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
     },
-    identities: {
-      '0xFirstAddress': {},
-    },
   },
 };
 const mockStore = (state = defaultState) => configureStore(middleware)(state);
@@ -65,6 +61,7 @@ describe('Actions', () => {
     background.signPersonalMessage = sinon.stub();
     background.signTypedMessage = sinon.stub();
     background.abortTransactionSigning = sinon.stub();
+    background.toggleExternalServices = sinon.stub();
   });
 
   describe('#tryUnlockMetamask', () => {
@@ -246,7 +243,6 @@ describe('Actions', () => {
       background.getState.callsFake((cb) =>
         cb(null, {
           currentLocale: 'test',
-          selectedAddress: '0xAnotherAddress',
           providerConfig: {
             chainId: '0x1',
           },
@@ -255,9 +251,6 @@ describe('Actions', () => {
               balance: '0x0',
             },
           },
-          identities: {
-            '0xAnotherAddress': {},
-          },
           internalAccounts: {
             accounts: {
               '22497cc9-e791-42b8-adef-2f13ef216b86': {
@@ -731,7 +724,6 @@ describe('Actions', () => {
         getState: sinon.stub().callsFake((cb) =>
           cb(null, {
             currentLocale: 'test',
-            selectedAddress: '0xFirstAddress',
           }),
         ),
       });
@@ -801,54 +793,6 @@ describe('Actions', () => {
     });
   });
 
-  describe('#setSelectedAddress', () => {
-    afterEach(() => {
-      sinon.restore();
-    });
-
-    it('calls setSelectedAddress in background', async () => {
-      const store = mockStore();
-
-      const setSelectedAddressSpy = sinon.stub().callsFake((_, cb) => cb());
-
-      background.getApi.returns({
-        setSelectedAddress: setSelectedAddressSpy,
-      });
-
-      setBackgroundConnection(background.getApi());
-
-      await store.dispatch(
-        actions.setSelectedAddress(
-          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-        ),
-      );
-      expect(setSelectedAddressSpy.callCount).toStrictEqual(1);
-    });
-
-    it('errors when setSelectedAddress throws', async () => {
-      const store = mockStore();
-
-      const setSelectedAddressSpy = sinon
-        .stub()
-        .callsFake((_, cb) => cb(new Error('error')));
-
-      background.getApi.returns({
-        setSelectedAddress: setSelectedAddressSpy,
-      });
-
-      setBackgroundConnection(background.getApi());
-
-      const expectedActions = [
-        { type: 'SHOW_LOADING_INDICATION', payload: undefined },
-        { type: 'DISPLAY_WARNING', payload: 'error' },
-        { type: 'HIDE_LOADING_INDICATION' },
-      ];
-
-      await store.dispatch(actions.setSelectedAddress());
-      expect(store.getActions()).toStrictEqual(expectedActions);
-    });
-  });
-
   describe('#setSelectedAccount', () => {
     afterEach(() => {
       sinon.restore();
@@ -890,11 +834,9 @@ describe('Actions', () => {
       const setSelectedInternalAccountSpy = sinon
         .stub()
         .callsFake((_, cb) => cb());
-      const setSelectedAddressSpy = sinon.stub().callsFake((_, cb) => cb());
 
       background.getApi.returns({
         setSelectedInternalAccount: setSelectedInternalAccountSpy,
-        setSelectedAddress: setSelectedAddressSpy,
       });
 
       setBackgroundConnection(background.getApi());
@@ -902,8 +844,6 @@ describe('Actions', () => {
       await store.dispatch(actions.setSelectedAccount('0x123'));
       expect(setSelectedInternalAccountSpy.callCount).toStrictEqual(1);
       expect(setSelectedInternalAccountSpy.calledWith('mock-id')).toBe(true);
-      expect(setSelectedAddressSpy.callCount).toStrictEqual(1);
-      expect(setSelectedAddressSpy.calledWith('0x123')).toBe(true);
     });
 
     it('displays warning if setSelectedAccount throws', async () => {
@@ -942,11 +882,9 @@ describe('Actions', () => {
       const setSelectedInternalAccountSpy = sinon
         .stub()
         .callsFake((_, cb) => cb(new Error('error')));
-      const setSelectedAddressSpy = sinon.stub().callsFake((_, cb) => cb());
 
       background.getApi.returns({
         setSelectedInternalAccount: setSelectedInternalAccountSpy,
-        setSelectedAddress: setSelectedAddressSpy,
       });
 
       setBackgroundConnection(background.getApi());
@@ -1714,6 +1652,55 @@ describe('Actions', () => {
     });
   });
 
+  describe('#setServiceWorkerKeepAlivePreference', () => {
+    afterEach(() => {
+      sinon.restore();
+    });
+
+    it('sends a value to background', async () => {
+      const store = mockStore();
+      const setServiceWorkerKeepAlivePreferenceStub = sinon
+        .stub()
+        .callsFake((_, cb) => cb());
+
+      setBackgroundConnection({
+        setServiceWorkerKeepAlivePreference:
+          setServiceWorkerKeepAlivePreferenceStub,
+      });
+
+      await store.dispatch(actions.setServiceWorkerKeepAlivePreference(true));
+      expect(setServiceWorkerKeepAlivePreferenceStub.callCount).toStrictEqual(
+        1,
+      );
+      expect(setServiceWorkerKeepAlivePreferenceStub.calledWith(true)).toBe(
+        true,
+      );
+    });
+
+    it('errors when setServiceWorkerKeepAlivePreference in background throws', async () => {
+      const store = mockStore();
+      const setServiceWorkerKeepAlivePreferenceStub = sinon
+        .stub()
+        .callsFake((_, cb) => {
+          cb(new Error('error'));
+        });
+
+      setBackgroundConnection({
+        setServiceWorkerKeepAlivePreference:
+          setServiceWorkerKeepAlivePreferenceStub,
+      });
+
+      const expectedActions = [
+        { type: 'SHOW_LOADING_INDICATION', payload: undefined },
+        { type: 'DISPLAY_WARNING', payload: 'error' },
+        { type: 'HIDE_LOADING_INDICATION' },
+      ];
+
+      await store.dispatch(actions.setServiceWorkerKeepAlivePreference(false));
+      expect(store.getActions()).toStrictEqual(expectedActions);
+    });
+  });
+
   describe('#setParticipateInMetaMetrics', () => {
     beforeAll(() => {
       window.sentry = {
@@ -2066,7 +2053,6 @@ describe('Actions', () => {
         getState: sinon.stub().callsFake((cb) =>
           cb(null, {
             currentLocale: 'test',
-            selectedAddress: '0xFirstAddress',
             providerConfig: {
               chainId: '0x1',
             },
@@ -2075,9 +2061,6 @@ describe('Actions', () => {
                 balance: '0x0',
               },
             },
-            identities: {
-              '0xFirstAddress': {},
-            },
             internalAccounts: {
               accounts: {
                 '8e110453-2231-4e62-82de-29b913dfef4b': {
@@ -2191,4 +2174,55 @@ describe('Actions', () => {
       expect(expectedAction.payload.originalTransactionId).toBe(txId);
     });
   });
+
+  describe('#removeAndIgnoreNft', () => {
+    afterEach(() => {
+      sinon.restore();
+    });
+
+    it('should throw when no address found', async () => {
+      const store = mockStore();
+
+      await expect(
+        store.dispatch(actions.removeAndIgnoreNft(undefined, '55')),
+      ).rejects.toThrow('MetaMask - Cannot ignore NFT without address');
+    });
+
+    it('should throw when no tokenId found', async () => {
+      const store = mockStore();
+
+      await expect(
+        store.dispatch(actions.removeAndIgnoreNft('Oxtest', undefined)),
+      ).rejects.toThrow('MetaMask - Cannot ignore NFT without tokenID');
+    });
+
+    it('should throw when removeAndIgnoreNft throws an error', async () => {
+      const store = mockStore();
+      const error = new Error('remove nft fake error');
+      background.removeAndIgnoreNft = sinon.stub().throws(error);
+
+      setBackgroundConnection(background);
+
+      await expect(
+        store.dispatch(actions.removeAndIgnoreNft('Oxtest', '6')),
+      ).rejects.toThrow(error);
+    });
+  });
+
+  describe('#toggleExternalServices', () => {
+    it('calls toggleExternalServices', async () => {
+      const store = mockStore();
+
+      setBackgroundConnection(background);
+
+      store.dispatch(actions.toggleExternalServices(true));
+
+      // expect it to have been called once, with true as the value
+      expect(background.toggleExternalServices.callCount).toStrictEqual(1);
+      expect(background.toggleExternalServices.getCall(0).args).toStrictEqual([
+        true,
+        expect.any(Function),
+      ]);
+    });
+  });
 });
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 232607ad6fd9..4b251860fd6b 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -36,6 +36,7 @@ import {
   NetworkConfiguration,
 } from '@metamask/network-controller';
 import { InterfaceState } from '@metamask/snaps-sdk';
+import { KeyringTypes } from '@metamask/keyring-controller';
 import { getMethodDataAsync } from '../helpers/utils/transactions.util';
 import switchDirection from '../../shared/lib/switch-direction';
 import {
@@ -84,7 +85,6 @@ import {
   LEDGER_USB_VENDOR_ID,
 } from '../../shared/constants/hardware-wallets';
 import {
-  MetaMetricsEventCategory,
   MetaMetricsEventFragment,
   MetaMetricsEventOptions,
   MetaMetricsEventPayload,
@@ -92,9 +92,12 @@ import {
   MetaMetricsPageOptions,
   MetaMetricsPagePayload,
   MetaMetricsReferrerObject,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../shared/constants/metametrics';
 import { parseSmartTransactionsError } from '../pages/swaps/swaps.util';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
+import { getSmartTransactionsOptInStatus } from '../../shared/modules/selectors';
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
 import { NOTIFICATIONS_EXPIRATION_DELAY } from '../helpers/constants/notifications';
 ///: END:ONLY_INCLUDE_IF
@@ -197,6 +200,8 @@ export function createNewVaultAndRestore(
     );
 
     // TODO: Add types for vault
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let vault: any;
     return new Promise<void>((resolve, reject) => {
       callBackgroundMethod(
@@ -411,6 +416,8 @@ export function removeAccount(
 
 export function importNewAccount(
   strategy: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   args: any[],
   loadingMessage: ReactFragment,
 ): ThunkAction<
@@ -451,7 +458,10 @@ export function addNewAccount(): ThunkAction<
 > {
   log.debug(`background.addNewAccount`);
   return async (dispatch, getState) => {
-    const oldAccounts = getInternalAccounts(getState());
+    const oldAccounts = getInternalAccounts(getState()).filter(
+      (internalAccount) =>
+        internalAccount.metadata.keyring.type === KeyringTypes.hd,
+    );
     dispatch(showLoadingIndication());
 
     let addedAccountAddress;
@@ -793,6 +803,8 @@ const updateMetamaskStateFromBackground = (): Promise<
  */
 export function updatePreviousGasParams(
   txId: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   previousGasParams: Record<string, any>,
 ): ThunkAction<
   Promise<TransactionMeta>,
@@ -1196,6 +1208,8 @@ export function removeSnap(
     ///: END:ONLY_INCLUDE_IF
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     const subjects = getPermissionSubjects(getState()) as {
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       [k: string]: { permissions: Record<string, any> };
     };
 
@@ -1238,6 +1252,8 @@ export async function handleSnapRequest(args: {
     id?: string;
     jsonrpc: '2.0';
     method: string;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     params?: Record<string, any>;
   };
 }): Promise<void> {
@@ -1607,8 +1623,12 @@ export function updateMetamaskState(
       newState.addressBook?.[newProviderConfig?.chainId] ?? {};
     const oldAddressBook =
       currentState.addressBook?.[providerConfig?.chainId] ?? {};
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const newAccounts: { [address: string]: Record<string, any> } =
       getMetaMaskAccounts({ metamask: newState });
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const oldAccounts: { [address: string]: Record<string, any> } =
       getMetaMaskAccounts({ metamask: currentState });
     const newSelectedAccount = newAccounts[newSelectedAddress];
@@ -1716,28 +1736,6 @@ export function lockMetamask(): ThunkAction<
   };
 }
 
-async function _setSelectedAddress(address: string): Promise<void> {
-  log.debug(`background.setSelectedAddress`);
-  await submitRequestToBackground('setSelectedAddress', [address]);
-}
-
-export function setSelectedAddress(
-  address: string,
-): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
-  return async (dispatch: MetaMaskReduxDispatch) => {
-    dispatch(showLoadingIndication());
-    log.debug(`background.setSelectedAddress`);
-    try {
-      await _setSelectedAddress(address);
-    } catch (error) {
-      dispatch(displayWarning(error));
-      return;
-    } finally {
-      dispatch(hideLoadingIndication());
-    }
-  };
-}
-
 async function _setSelectedInternalAccount(accountId: string): Promise<void> {
   log.debug(`background.setSelectedInternalAccount`);
   await submitRequestToBackground('setSelectedInternalAccount', [accountId]);
@@ -1771,7 +1769,7 @@ export function setSelectedAccount(
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch, getState) => {
     dispatch(showLoadingIndication());
-    log.debug(`background.setSelectedAddress`);
+    log.debug(`background.setSelectedAccount`);
 
     const state = getState();
     const unconnectedAccountAccountAlertIsEnabled =
@@ -1791,7 +1789,6 @@ export function setSelectedAccount(
       !currentTabIsConnectedToNextAddress;
 
     try {
-      await _setSelectedAddress(address);
       await _setSelectedInternalAccount(internalAccount.id);
       await forceUpdateMetamaskState(dispatch);
     } catch (error) {
@@ -2069,7 +2066,7 @@ export function addNftVerifyOwnership(
 export function removeAndIgnoreNft(
   address: string,
   tokenID: string,
-  dontShowLoadingIndicator: boolean,
+  shouldShowLoadingIndicator?: boolean,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch: MetaMaskReduxDispatch) => {
     if (!address) {
@@ -2078,7 +2075,7 @@ export function removeAndIgnoreNft(
     if (!tokenID) {
       throw new Error('MetaMask - Cannot ignore NFT without tokenID');
     }
-    if (!dontShowLoadingIndicator) {
+    if (!shouldShowLoadingIndicator) {
       dispatch(showLoadingIndication());
     }
     try {
@@ -2086,6 +2083,7 @@ export function removeAndIgnoreNft(
     } catch (error) {
       logErrorWithMessage(error);
       dispatch(displayWarning(error));
+      throw error;
     } finally {
       await forceUpdateMetamaskState(dispatch);
       dispatch(hideLoadingIndication());
@@ -2173,8 +2171,82 @@ export function clearPendingTokens(): Action {
   };
 }
 
+/**
+ * Action to switch globally selected network and set switched network details
+ * for the purpose of displaying the user a toast about the network change
+ *
+ * @param networkClientIdForThisDomain - Thet network client ID last used by the origin
+ * @param selectedTabOrigin - Origin of the current tab
+ */
+export function automaticallySwitchNetwork(
+  networkClientIdForThisDomain: string,
+  selectedTabOrigin: string,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await dispatch(setActiveNetwork(networkClientIdForThisDomain));
+    await dispatch(
+      setSwitchedNetworkDetails({
+        networkClientId: networkClientIdForThisDomain,
+        origin: selectedTabOrigin,
+      }),
+    );
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
+
+/**
+ * Action to store details about the switched-to network in the background state
+ *
+ * @param switchedNetworkDetails - Object containing networkClientId and origin
+ * @param switchedNetworkDetails.networkClientId
+ * @param switchedNetworkDetails.selectedTabOrigin
+ */
+export function setSwitchedNetworkDetails(switchedNetworkDetails: {
+  networkClientId: string;
+  selectedTabOrigin: string;
+}): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await submitRequestToBackground('setSwitchedNetworkDetails', [
+      switchedNetworkDetails,
+    ]);
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
+
+/**
+ * Action to clear details about the switched-to network in the background state
+ */
+export function clearSwitchedNetworkDetails(): ThunkAction<
+  void,
+  MetaMaskReduxState,
+  unknown,
+  AnyAction
+> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await submitRequestToBackground('clearSwitchedNetworkDetails', []);
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
+
+/**
+ * Update the currentPopupid generated when the user opened the popup
+ *
+ * @param id - The Snap interface ID.
+ * @returns Promise Resolved on successfully submitted background request.
+ */
+export function setCurrentExtensionPopupId(
+  id: number,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await submitRequestToBackground<void>('setCurrentExtensionPopupId', [id]);
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
+
 export function abortTransactionSigning(
   transactionId: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): ThunkAction<Promise<void>, MetaMaskReduxState, any, AnyAction> {
   return async (dispatch: MetaMaskReduxDispatch) => {
     try {
@@ -2187,6 +2259,23 @@ export function abortTransactionSigning(
   };
 }
 
+export function getLayer1GasFee({
+  chainId,
+  networkClientId,
+  transactionParams,
+}: {
+  chainId?: Hex;
+  networkClientId?: NetworkClientId;
+  transactionParams: TransactionParams;
+}): // TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+ThunkAction<Promise<void>, MetaMaskReduxState, any, AnyAction> {
+  return async () =>
+    await submitRequestToBackground('getLayer1GasFee', [
+      { chainId, networkClientId, transactionParams },
+    ]);
+}
+
 export function createCancelTransaction(
   txId: string,
   customGasSettings: CustomGasSettings,
@@ -2544,6 +2633,8 @@ export function hideImportTokensModal(): Action {
   };
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type ModalPayload = { name: string } & Record<string, any>;
 
 export function showModal(payload: ModalPayload): PayloadAction<ModalPayload> {
@@ -2576,6 +2667,8 @@ export function hideImportNftsModal(): Action {
   };
 }
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function setConfirmationExchangeRates(value: Record<string, any>) {
   return {
     type: actionConstants.SET_CONFIRMATION_EXCHANGE_RATES,
@@ -2981,10 +3074,38 @@ export function setPetnamesEnabled(value: boolean) {
   return setPreference('petnamesEnabled', value);
 }
 
+export function setRedesignedConfirmationsEnabled(value: boolean) {
+  return setPreference('redesignedConfirmationsEnabled', value);
+}
+
+export function setFeatureNotificationsEnabled(value: boolean) {
+  return setPreference('featureNotificationsEnabled', value);
+}
+
 export function setShowExtensionInFullSizeView(value: boolean) {
   return setPreference('showExtensionInFullSizeView', value);
 }
 
+export function setSmartTransactionsOptInStatus(
+  value: boolean,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async (dispatch, getState) => {
+    const smartTransactionsOptInStatus = getSmartTransactionsOptInStatus(
+      getState(),
+    );
+    trackMetaMetricsEvent({
+      category: MetaMetricsEventCategory.Settings,
+      event: MetaMetricsEventName.SettingsUpdated,
+      properties: {
+        stx_opt_in: value,
+        prev_stx_opt_in: smartTransactionsOptInStatus,
+      },
+    });
+    await dispatch(setPreference('smartTransactionsOptInStatus', value));
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
+
 export function setAutoLockTimeLimit(value: boolean) {
   return setPreference('autoLockTimeLimit', value);
 }
@@ -3031,6 +3152,46 @@ export function completeOnboarding() {
   };
 }
 
+export function resetOnboarding(): ThunkAction<
+  void,
+  MetaMaskReduxState,
+  unknown,
+  AnyAction
+> {
+  return async (dispatch) => {
+    try {
+      await dispatch(setSeedPhraseBackedUp(false));
+      dispatch(resetOnboardingAction());
+    } catch (err) {
+      console.error(err);
+    }
+  };
+}
+
+export function resetOnboardingAction() {
+  return {
+    type: actionConstants.RESET_ONBOARDING,
+  };
+}
+
+export function setServiceWorkerKeepAlivePreference(
+  value: boolean,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    dispatch(showLoadingIndication());
+    log.debug(`background.setServiceWorkerKeepAlivePreference`);
+    try {
+      await submitRequestToBackground('setServiceWorkerKeepAlivePreference', [
+        value,
+      ]);
+    } catch (error) {
+      dispatch(displayWarning(error));
+    } finally {
+      dispatch(hideLoadingIndication());
+    }
+  };
+}
+
 export async function forceUpdateMetamaskState(
   dispatch: MetaMaskReduxDispatch,
 ) {
@@ -3347,6 +3508,19 @@ export function setIpfsGateway(
   };
 }
 
+export function toggleExternalServices(
+  val: boolean,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return (dispatch: MetaMaskReduxDispatch) => {
+    log.debug(`background.toggleExternalServices`);
+    callBackgroundMethod('toggleExternalServices', [val], (err) => {
+      if (err) {
+        dispatch(displayWarning(err));
+      }
+    });
+  };
+}
+
 export function setIsIpfsGatewayEnabled(
   val: string,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
@@ -4285,6 +4459,39 @@ export async function removePollingTokenFromAppState(pollingToken: string) {
   ]);
 }
 
+/**
+ * Informs the CurrencyRateController that the UI requires currency rate polling
+ *
+ * @param networkClientId - unique identifier for the network client
+ * @returns polling token that can be used to stop polling
+ */
+export async function currencyRateStartPollingByNetworkClientId(
+  networkClientId: string,
+): Promise<string> {
+  const pollingToken = await submitRequestToBackground(
+    'currencyRateStartPollingByNetworkClientId',
+    [networkClientId],
+  );
+  await addPollingTokenToAppState(pollingToken);
+  return pollingToken;
+}
+
+/**
+ * Informs the CurrencyRateController that the UI no longer requires currency rate polling
+ * for the given network client.
+ * If all network clients unsubscribe, the controller stops polling.
+ *
+ * @param pollingToken - Poll token received from calling startPollingByNetworkClientId
+ */
+export async function currencyRateStopPollingByPollingToken(
+  pollingToken: string,
+) {
+  await submitRequestToBackground('currencyRateStopPollingByPollingToken', [
+    pollingToken,
+  ]);
+  await removePollingTokenFromAppState(pollingToken);
+}
+
 /**
  * Informs the GasFeeController that the UI requires gas fee polling
  *
@@ -4399,6 +4606,10 @@ export function trackMetaMetricsPage(
   ]);
 }
 
+export function resetViewedNotifications() {
+  return submitRequestToBackground('resetViewedNotifications');
+}
+
 export function updateViewedNotifications(notificationIdViewedStatusMap: {
   [notificationId: string]: boolean;
 }) {
@@ -4426,26 +4637,6 @@ export async function setWeb3ShimUsageAlertDismissed(origin: string) {
 }
 
 // Smart Transactions Controller
-export async function setSmartTransactionsOptInStatus(
-  optInState: boolean,
-  prevOptInState: boolean,
-) {
-  trackMetaMetricsEvent({
-    actionId: generateActionId(),
-    event: 'STX OptIn',
-    category: MetaMetricsEventCategory.Swaps,
-    sensitiveProperties: {
-      stx_enabled: true,
-      current_stx_enabled: true,
-      stx_user_opt_in: optInState,
-      stx_prev_user_opt_in: prevOptInState,
-    },
-  });
-  await submitRequestToBackground('setSmartTransactionsOptInStatus', [
-    optInState,
-  ]);
-}
-
 export function clearSmartTransactionFees() {
   submitRequestToBackground('clearSmartTransactionFees');
 }
@@ -4652,10 +4843,6 @@ export function hidePermissionsTour() {
   return submitRequestToBackground('setShowPermissionsTour', [false]);
 }
 
-export function hideProductTour() {
-  return submitRequestToBackground('setShowProductTour', [false]);
-}
-
 export function hideAccountBanner() {
   return submitRequestToBackground('setShowAccountBanner', [false]);
 }
@@ -4664,6 +4851,28 @@ export function hideNetworkBanner() {
   return submitRequestToBackground('setShowNetworkBanner', [false]);
 }
 
+export function neverShowSwitchedNetworkMessage() {
+  return submitRequestToBackground('setSwitchedNetworkNeverShowMessage', [
+    true,
+  ]);
+}
+
+/**
+ * Sends the background state the networkClientId and domain upon network switch
+ *
+ * @param selectedTabOrigin - The origin to set the new networkClientId for
+ * @param networkClientId - The new networkClientId
+ */
+export function setNetworkClientIdForDomain(
+  selectedTabOrigin: string,
+  networkClientId: string,
+): Promise<void> {
+  return submitRequestToBackground('setNetworkClientIdForDomain', [
+    selectedTabOrigin,
+    networkClientId,
+  ]);
+}
+
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 export function setSecurityAlertsEnabled(val: boolean): void {
   try {
@@ -4847,6 +5056,8 @@ export function updateProposedNames(
     );
 
     return data;
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   }) as any;
 }
 
@@ -4855,6 +5066,8 @@ export function setName(
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
   return (async () => {
     await submitRequestToBackground<void>('setName', [request]);
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   }) as any;
 }
 
@@ -4899,6 +5112,8 @@ export function updateInterfaceState(
   return (async (dispatch: MetaMaskReduxDispatch) => {
     await submitRequestToBackground<void>('updateInterfaceState', [id, state]);
     await forceUpdateMetamaskState(dispatch);
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   }) as any;
 }
 
@@ -4914,6 +5129,8 @@ export function deleteInterface(
   return (async (dispatch: MetaMaskReduxDispatch) => {
     await submitRequestToBackground<void>('deleteInterface', [id]);
     await forceUpdateMetamaskState(dispatch);
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   }) as any;
 }
 ///: END:ONLY_INCLUDE_IF
diff --git a/ui/store/background-connection.ts b/ui/store/background-connection.ts
index c6c0767ad21d..5c7222c040e6 100644
--- a/ui/store/background-connection.ts
+++ b/ui/store/background-connection.ts
@@ -4,10 +4,14 @@ let background:
   | ({
       connectionStream: { readable: boolean };
       DisconnectError: typeof Error;
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } & Record<string, (...args: any[]) => any>)
   | null = null;
 let promisifiedBackground: Record<
   string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (...args: any[]) => Promise<any>
 > | null = null;
 
@@ -22,6 +26,8 @@ export const generateActionId = () => Date.now() + Math.random();
  */
 export function submitRequestToBackground<R>(
   method: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   args?: any[],
 ): Promise<R> {
   return promisifiedBackground?.[method](
@@ -41,6 +47,8 @@ type CallbackMethod<R = unknown> = (error?: unknown, result?: R) => void;
  */
 export const callBackgroundMethod = <R>(
   method: string,
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   args: any[],
   callback: CallbackMethod<R>,
 ) => {
@@ -57,5 +65,7 @@ export async function setBackgroundConnection(
   backgroundConnection: typeof background,
 ) {
   background = backgroundConnection;
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   promisifiedBackground = pify(background as Record<string, any>);
 }
diff --git a/ui/store/institutional/institution-actions.test.js b/ui/store/institutional/institution-actions.test.js
index be4334abebd2..3746aad3e036 100644
--- a/ui/store/institutional/institution-actions.test.js
+++ b/ui/store/institutional/institution-actions.test.js
@@ -14,16 +14,12 @@ const middleware = [thunk];
 const defaultState = {
   metamask: {
     currentLocale: 'test',
-    selectedAddress: '0xFirstAddress',
     providerConfig: { chainId: '0x1' },
     accounts: {
       '0xFirstAddress': {
         balance: '0x0',
       },
     },
-    identities: {
-      '0xFirstAddress': {},
-    },
     custodyStatusMaps: {
       saturn: {
         signed: {
@@ -204,7 +200,6 @@ describe('#updateCustodyState', () => {
         chainId: '0x1',
       },
       featureFlags: {},
-      selectedAddress: '0xAddress',
     };
 
     const custodyState = updateCustodyState(store.dispatch, newState, newState);
@@ -228,7 +223,6 @@ describe('#updateCustodyState', () => {
         chainId: '0x1',
       },
       featureFlags: {},
-      selectedAddress: '0xAddress',
       transactions: [
         {
           id: 0,
@@ -283,7 +277,6 @@ describe('#updateCustodyState', () => {
         chainId: '0x1',
       },
       featureFlags: {},
-      selectedAddress: '0xAddress',
       transactions: [
         {
           id: 0,
diff --git a/ui/store/institutional/institution-actions.ts b/ui/store/institutional/institution-actions.ts
index d0e81d47af44..76ef0aeaf214 100644
--- a/ui/store/institutional/institution-actions.ts
+++ b/ui/store/institutional/institution-actions.ts
@@ -57,6 +57,8 @@ export function showCustodyConfirmLink({
 export function updateCustodyState(
   dispatch: ThunkDispatch<CombinedBackgroundAndReduxState, unknown, AnyAction>,
   newState: MetaMaskReduxState['metamask'],
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   state: CombinedBackgroundAndReduxState & any,
 ) {
   if (!newState.transactions || !state.metamask.transactions) {
@@ -72,6 +74,8 @@ export function updateCustodyState(
   const differentTxs = newCurrentNetworkTxList.filter(
     (item: TransactionMeta) =>
       oldCurrentNetworkTxList.filter(
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (tx: { [key: string]: any }) =>
           tx.custodyId === item.custodyId &&
           tx.custodyStatus !== item.custodyStatus,
diff --git a/ui/store/institutional/institution-background.ts b/ui/store/institutional/institution-background.ts
index cd437d09f651..a049a2be7015 100644
--- a/ui/store/institutional/institution-background.ts
+++ b/ui/store/institutional/institution-background.ts
@@ -13,6 +13,7 @@ import {
 } from '../background-connection';
 import { MetaMaskReduxDispatch, MetaMaskReduxState } from '../store';
 import { isErrorWithMessage } from '../../../shared/modules/error';
+import { ConnectionRequest } from '../../../shared/constants/mmi-controller';
 
 export function showInteractiveReplacementTokenBanner({
   url,
@@ -29,6 +30,8 @@ export function showInteractiveReplacementTokenBanner({
           oldRefreshToken,
         },
       ]);
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       if (err) {
         dispatch(displayWarning(err.message));
@@ -58,6 +61,8 @@ export function setTypedMessageInProgress(msgId: string) {
     dispatch(showLoadingIndication());
     try {
       await submitRequestToBackground('setTypedMessageInProgress', [msgId]);
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
       log.error(error);
       dispatch(displayWarning(error.message));
@@ -73,6 +78,8 @@ export function setPersonalMessageInProgress(msgId: string) {
     dispatch(showLoadingIndication());
     try {
       await submitRequestToBackground('setPersonalMessageInProgress', [msgId]);
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
       log.error(error);
       dispatch(displayWarning(error.message));
@@ -92,11 +99,17 @@ export function setPersonalMessageInProgress(msgId: string) {
 export function mmiActionsFactory() {
   function createAsyncAction(
     name: string,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     params: any,
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     useForceUpdateMetamaskState?: any,
     loadingText?: string,
   ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
     log.debug(`background.${name}`);
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return async (dispatch: any) => {
       if (loadingText) {
         dispatch(showLoadingIndication(loadingText));
@@ -123,6 +136,8 @@ export function mmiActionsFactory() {
     };
   }
 
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function createAction(name: string, payload: any) {
     return () => {
       callBackgroundMethod(name, [payload], (err) => {
@@ -235,5 +250,7 @@ export function mmiActionsFactory() {
       createAsyncAction('setCustodianNewRefreshToken', [
         { address, refreshToken },
       ]),
+    setConnectionRequest: (payload: ConnectionRequest | null) =>
+      createAsyncAction('setConnectionRequest', [payload]),
   };
 }
diff --git a/ui/store/store.ts b/ui/store/store.ts
index 8b8ef88785a1..98745a8bb069 100644
--- a/ui/store/store.ts
+++ b/ui/store/store.ts
@@ -55,12 +55,6 @@ type TemporaryBackgroundState = {
     chainId: string;
   };
   transactions: TransactionMeta[];
-  selectedAddress: string;
-  identities: {
-    [address: string]: {
-      balance: string;
-    };
-  };
   ledgerTransportType: LedgerTransportTypes;
   unapprovedDecryptMsgs: MessagesIndexedById;
   unapprovedMsgs: MessagesIndexedById;
@@ -81,6 +75,8 @@ type TemporaryBackgroundState = {
   gasFeeEstimates: GasFeeEstimates;
   gasEstimateType: GasEstimateType;
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   custodyAccountDetails?: { [key: string]: any };
   ///: END:ONLY_INCLUDE_IF
   internalAccounts: {
@@ -100,6 +96,8 @@ export type CombinedBackgroundAndReduxState = RootReducerReturnType & {
   metamask: RootReducerReturnType['metamask'] & TemporaryBackgroundState;
 };
 
+// TODO: Replace `any` with type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export default function configureStore(preloadedState: any) {
   const debugModeEnabled = Boolean(process.env.METAMASK_DEBUG);
   const isDev = debugModeEnabled && !process.env.IN_TEST;
diff --git a/yarn.lock b/yarn.lock
index e1297788a9b3..26b739fb27d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -462,12 +462,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:7.23.9, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.13.9, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/parser@npm:7.23.9"
+"@babel/parser@npm:7.24.0":
+  version: 7.24.0
+  resolution: "@babel/parser@npm:7.24.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 727a7a807100f6a26df859e2f009c4ddbd0d3363287b45daa50bd082ccd0d431d0c4d0e610a91f806e04a1918726cd0f5a0592c9b902a815337feed12e1cafd9
+  checksum: 3e5ebb903a6f71629a9d0226743e37fe3d961e79911d2698b243637f66c4df7e3e0a42c07838bc0e7cc9fcd585d9be8f4134a145b9459ee4a459420fb0d1360b
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.13.9, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.0":
+  version: 7.24.4
+  resolution: "@babel/parser@npm:7.24.4"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 3742cc5068036287e6395269dce5a2735e6349cdc8d4b53297c75f98c580d7e1c8cb43235623999d151f2ef975d677dbc2c2357573a1855caa71c271bf3046c9
   languageName: node
   linkType: hard
 
@@ -1618,7 +1627,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:7.24.0, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.23.4":
+"@babel/runtime@npm:7.24.0":
   version: 7.24.0
   resolution: "@babel/runtime@npm:7.24.0"
   dependencies:
@@ -1627,6 +1636,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.23.4, @babel/runtime@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/runtime@npm:7.24.1"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 3a8d61400c636d1ce3a42895a106cd4dfb4e9b88832a8a754a724c68652f821d7a46dce394305d7623f9f0d3597bf0a98aeb5f9c150ef60e14bbbf66caab4654
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch":
   version: 7.24.0
   resolution: "@babel/runtime@patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch::version=7.24.0&hash=cce522"
@@ -1647,9 +1665,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7.23.9, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2":
-  version: 7.23.9
-  resolution: "@babel/traverse@npm:7.23.9"
+"@babel/traverse@npm:7.24.0, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2":
+  version: 7.24.0
+  resolution: "@babel/traverse@npm:7.24.0"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
@@ -1657,22 +1675,22 @@ __metadata:
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: e2bb845f7f229feb7c338f7e150f5f1abc5395dcd3a6a47f63a25242ec3ec6b165f04a6df7d4849468547faee34eb3cf52487eb0bd867a7d3c42fec2a648266f
+  checksum: 5cc482248ebb79adcbcf021aab4e0e95bafe2a1736ee4b46abe6f88b59848ad73e15e219db8f06c9a33a14c64257e5b47e53876601e998a8c596accb1b7f4996
   languageName: node
   linkType: hard
 
-"@babel/types@npm:7.23.9, @babel/types@npm:^7.0.0, @babel/types@npm:^7.12.0, @babel/types@npm:^7.13.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.9
-  resolution: "@babel/types@npm:7.23.9"
+"@babel/types@npm:7.24.0, @babel/types@npm:^7.0.0, @babel/types@npm:^7.12.0, @babel/types@npm:^7.13.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/types@npm:7.24.0"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.23.4"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     to-fast-properties: "npm:^2.0.0"
-  checksum: bed9634e5fd0f9dc63c84cfa83316c4cb617192db9fedfea464fca743affe93736d7bf2ebf418ee8358751a9d388e303af87a0c050cb5d87d5870c1b0154f6cb
+  checksum: a0b4875ce2e132f9daff0d5b27c7f4c4fcc97f2b084bdc5834e92c9d32592778489029e65d99d00c406da612d87b72d7a236c0afccaa1435c028d0c94c9b6da4
   languageName: node
   linkType: hard
 
@@ -1738,6 +1756,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@contentful/rich-text-html-renderer@npm:^16.3.5":
+  version: 16.3.5
+  resolution: "@contentful/rich-text-html-renderer@npm:16.3.5"
+  dependencies:
+    "@contentful/rich-text-types": "npm:^16.3.5"
+    escape-html: "npm:^1.0.3"
+  checksum: 560ea4a5e8f7b34409c97732c7393f7e3b054a9a4ba9e32a0921cba347759ee5678b4579a1c0bcf538b97bbe033689e98bd13fba827f8dfbc7c54ee99499a423
+  languageName: node
+  linkType: hard
+
+"@contentful/rich-text-types@npm:^16.0.2, @contentful/rich-text-types@npm:^16.3.5":
+  version: 16.3.5
+  resolution: "@contentful/rich-text-types@npm:16.3.5"
+  checksum: ce06c18b6e9c6353f820784a4ff81b757df905204fea97952708c63ca6be53f98e6982a36fee1a443d7f200f4a534c70a7cc32679d4e7de1b5aa618dc241500b
+  languageName: node
+  linkType: hard
+
 "@cspotcode/source-map-support@npm:^0.8.0":
   version: 0.8.1
   resolution: "@cspotcode/source-map-support@npm:0.8.1"
@@ -2345,12 +2380,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/common@npm:^4.1.0, @ethereumjs/common@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@ethereumjs/common@npm:4.2.0"
+"@ethereumjs/common@npm:^4.1.0, @ethereumjs/common@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "@ethereumjs/common@npm:4.3.0"
   dependencies:
-    "@ethereumjs/util": "npm:^9.0.2"
-  checksum: dbf208d118ac30ff9a14d72a0fd16d3a1766c7627f29ca5a34134684e9200bc083f4dbeccab084018711a2f974a34f2f9deecbb495ec07d6f94cf9bd81bfa2ef
+    "@ethereumjs/util": "npm:^9.0.3"
+  checksum: 90f7fe1ba6827b65cd25e9bb4adf07a117ea554a950bb364d5fd9873cb770d383addb0ad34839a91fbec22ebc25516c6fb7e70ae0198c78f933920bf39797a94
   languageName: node
   linkType: hard
 
@@ -2403,20 +2438,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/tx@npm:^5.1.0":
-  version: 5.2.1
-  resolution: "@ethereumjs/tx@npm:5.2.1"
+"@ethereumjs/tx@npm:^5.1.0, @ethereumjs/tx@npm:^5.2.1":
+  version: 5.3.0
+  resolution: "@ethereumjs/tx@npm:5.3.0"
   dependencies:
-    "@ethereumjs/common": "npm:^4.2.0"
+    "@ethereumjs/common": "npm:^4.3.0"
     "@ethereumjs/rlp": "npm:^5.0.2"
-    "@ethereumjs/util": "npm:^9.0.2"
+    "@ethereumjs/util": "npm:^9.0.3"
     ethereum-cryptography: "npm:^2.1.3"
-  peerDependencies:
-    c-kzg: ^2.1.2
-  peerDependenciesMeta:
-    c-kzg:
-      optional: true
-  checksum: 87b473a99105c82f5a17f1f99442e421a0f515770ac3a9b58d9462a6d10ae1144f92a76a15abcf1b27496dfdcbb6e826eeb7b17636c8bde0613205623b0a1ddf
+  checksum: 4eb48e763d81ea0978648367d61c568c8d10f769c1ea7d32307ebe02299d4fa9fe5d7bf794ec1ee22e92edef6bfe1f459d5816e1c62d3f93602d931807ca488b
   languageName: node
   linkType: hard
 
@@ -2431,18 +2461,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/util@npm:^9.0.2":
-  version: 9.0.2
-  resolution: "@ethereumjs/util@npm:9.0.2"
+"@ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "@ethereumjs/util@npm:9.0.3"
   dependencies:
     "@ethereumjs/rlp": "npm:^5.0.2"
     ethereum-cryptography: "npm:^2.1.3"
-  peerDependencies:
-    c-kzg: ^2.1.2
-  peerDependenciesMeta:
-    c-kzg:
-      optional: true
-  checksum: 1b8aeb733f4c576bf9f0ade5a3d19da25d602cb068ed735a1fc344cc5f534a7dffe1f5c13139a3d7c805853bd9ec8ba194243fe6dee57d273f1201209846df83
+  checksum: d9c313a0672e0b4842ba80e2f413ccd5302c3942dc4ed718d6e3faab89c4eeeaaeb6661e9275679c22b83b1cb6502ea772e1c837d105b6a9faf5957a59bc3e4c
   languageName: node
   linkType: hard
 
@@ -2855,6 +2880,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@fastify/busboy@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "@fastify/busboy@npm:2.1.1"
+  checksum: 2bb8a7eca8289ed14c9eb15239bc1019797454624e769b39a0b90ed204d032403adc0f8ed0d2aef8a18c772205fa7808cf5a1b91f21c7bfc7b6032150b1062c5
+  languageName: node
+  linkType: hard
+
 "@figspec/components@npm:^1.0.1":
   version: 1.0.2
   resolution: "@figspec/components@npm:1.0.2"
@@ -2876,6 +2908,518 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@firebase/analytics-compat@npm:0.2.8":
+  version: 0.2.8
+  resolution: "@firebase/analytics-compat@npm:0.2.8"
+  dependencies:
+    "@firebase/analytics": "npm:0.10.2"
+    "@firebase/analytics-types": "npm:0.8.1"
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: bd26bd9ce5ef692394cf7ce21c8d5375ceb90614aee1d5bdb31910b8eff0844f8f812a3c8ba551ef4848f6d6bbbcb68e47b350967afa3fbf51e524c2b1c6865a
+  languageName: node
+  linkType: hard
+
+"@firebase/analytics-types@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@firebase/analytics-types@npm:0.8.1"
+  checksum: 934e61faef523b8d064f1801d70136eb8a3e4ae68c37fe7273be0e8aad1694965a5f4a23956ab25fa232b20f7c151fa7dba709b2a0c3593de374db605c26187c
+  languageName: node
+  linkType: hard
+
+"@firebase/analytics@npm:0.10.2":
+  version: 0.10.2
+  resolution: "@firebase/analytics@npm:0.10.2"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/installations": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 841c5350ccaab26283646aba5b1c48082a3694a1a47570a7c6a3845f2a69bc1f43355da611bf9fb78070ba709ddf843d9c8dd94a13697dbcc5a985eda3ef2f8c
+  languageName: node
+  linkType: hard
+
+"@firebase/app-check-compat@npm:0.3.10":
+  version: 0.3.10
+  resolution: "@firebase/app-check-compat@npm:0.3.10"
+  dependencies:
+    "@firebase/app-check": "npm:0.8.3"
+    "@firebase/app-check-types": "npm:0.5.1"
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: 7f369459edf76d4aef9d7bb0660e5cddbe8cfa85ef51adba5b78c68fc8bac5f1762c3c6f1d8e1f46d764d028387dcff0eff729042ccb7a61c4c0ec5b63e41b90
+  languageName: node
+  linkType: hard
+
+"@firebase/app-check-interop-types@npm:0.3.1":
+  version: 0.3.1
+  resolution: "@firebase/app-check-interop-types@npm:0.3.1"
+  checksum: a93415e4acb0896c9fe99748d01303369d133e468ca97ef3021c54b4fd7aec16951adfcba0c9ff4b6e7e951fcb3c62d1ad9864516a37ca77d5120beebcec6994
+  languageName: node
+  linkType: hard
+
+"@firebase/app-check-types@npm:0.5.1":
+  version: 0.5.1
+  resolution: "@firebase/app-check-types@npm:0.5.1"
+  checksum: 5c546dae2f0ed6c3cac7896517d28ee224f7a4b6dc24ecb8eb14ffac983a551ae72aa1fea549f0786e70b346e219c700a6ddd811abbdb532679f8447da6db5b3
+  languageName: node
+  linkType: hard
+
+"@firebase/app-check@npm:0.8.3":
+  version: 0.8.3
+  resolution: "@firebase/app-check@npm:0.8.3"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: a64f947d5665512b3a3df285dc2912773499fd20e0caf50681e9d485511a19a333b7554034612c40dc66af0e0cd8592258a770ff2d3cd69f18c1f0f56062a416
+  languageName: node
+  linkType: hard
+
+"@firebase/app-compat@npm:0.2.31":
+  version: 0.2.31
+  resolution: "@firebase/app-compat@npm:0.2.31"
+  dependencies:
+    "@firebase/app": "npm:0.10.1"
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  checksum: 969b82047985b95dbb76993e97723fae43a04b3191af09f477674a3c39960f8473b18e2ff5dde397d6aa495f0d47445451e7833834ce875b46afc06049b4a8f6
+  languageName: node
+  linkType: hard
+
+"@firebase/app-types@npm:0.9.1":
+  version: 0.9.1
+  resolution: "@firebase/app-types@npm:0.9.1"
+  checksum: 98f53967113b8d442030da7904056ee344e1e0ac273889e985d6cbff0122632e7e6f02a5736aedfbf4563b4d2f60e4c930c0e3328c895d6a62983b2b4e7c81f8
+  languageName: node
+  linkType: hard
+
+"@firebase/app@npm:0.10.1":
+  version: 0.10.1
+  resolution: "@firebase/app@npm:0.10.1"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    idb: "npm:7.1.1"
+    tslib: "npm:^2.1.0"
+  checksum: 09ce322d200e65a05f0e386def2078c7aa856cf3dbd4ddc897c982128925fef40aa0024378a271e562686fbe753bb98043500d73cb6c7312ad9e8e6919e071af
+  languageName: node
+  linkType: hard
+
+"@firebase/auth-compat@npm:0.5.6":
+  version: 0.5.6
+  resolution: "@firebase/auth-compat@npm:0.5.6"
+  dependencies:
+    "@firebase/auth": "npm:1.7.1"
+    "@firebase/auth-types": "npm:0.12.1"
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+    undici: "npm:5.28.4"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: c521f86cde926d9592ac7d3d8395c5c1ff8dd601eaa28ec36598380751e2089070d6e289242841adb05daa57c6b32ca4707fb0d8f0722e7c5df374878c1585cf
+  languageName: node
+  linkType: hard
+
+"@firebase/auth-interop-types@npm:0.2.2":
+  version: 0.2.2
+  resolution: "@firebase/auth-interop-types@npm:0.2.2"
+  checksum: 900fe48dc41fd63dfe1e0a2b49ab2046b0f613beb0b56d2bd3fb59a6b6b4a6623f68be262a73bee46a1b28f6eec4a55307015b7169c2428acee4be024c14d4f0
+  languageName: node
+  linkType: hard
+
+"@firebase/auth-types@npm:0.12.1":
+  version: 0.12.1
+  resolution: "@firebase/auth-types@npm:0.12.1"
+  peerDependencies:
+    "@firebase/app-types": 0.x
+    "@firebase/util": 1.x
+  checksum: 4db2b3eaf9efcfe985fa14441e74b5b7bd5123aa0f1fcf8aa133eb5502526f62984a5d62488cd0faac1c63ca677b1a3ca05bc5f86154a54fe734d69a72846f85
+  languageName: node
+  linkType: hard
+
+"@firebase/auth@npm:1.7.1":
+  version: 1.7.1
+  resolution: "@firebase/auth@npm:1.7.1"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+    undici: "npm:5.28.4"
+  peerDependencies:
+    "@firebase/app": 0.x
+    "@react-native-async-storage/async-storage": ^1.18.1
+  peerDependenciesMeta:
+    "@react-native-async-storage/async-storage":
+      optional: true
+  checksum: ef728af26deadd4dee160f33684f2e703f3683258d113c9a97d932f626a2597efdf932d978edc7c98b21acbe9a2d6e98eb582d233cfb8aa5425e18f78bf308a1
+  languageName: node
+  linkType: hard
+
+"@firebase/component@npm:0.6.6":
+  version: 0.6.6
+  resolution: "@firebase/component@npm:0.6.6"
+  dependencies:
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  checksum: 963931307f36b2ce612c2e2caed50690e483863d496cf46ef268205abf6146f5d25ba04b536f1aeca8d3e434f9c1ca6bb8c2bdeac807bf2b290a3432a74f6360
+  languageName: node
+  linkType: hard
+
+"@firebase/database-compat@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@firebase/database-compat@npm:1.0.4"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/database": "npm:1.0.4"
+    "@firebase/database-types": "npm:1.0.2"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  checksum: f55bec1a55d7de6efb2c49e63d698fb236c0fbb0610ad8da22d1d2e06e8335c3353863c03d9baceb26d506e99737b1974466b205bc53715efad7adf5b0b1ac06
+  languageName: node
+  linkType: hard
+
+"@firebase/database-types@npm:1.0.2":
+  version: 1.0.2
+  resolution: "@firebase/database-types@npm:1.0.2"
+  dependencies:
+    "@firebase/app-types": "npm:0.9.1"
+    "@firebase/util": "npm:1.9.5"
+  checksum: 426615cd62db18ba6a19baac29f828eb50e59e55a427f5ccb5d4121f560abfd837d8163a2594459d0c6abc4444cd4f952377b26c0ab4d981e0b86e4378eb688e
+  languageName: node
+  linkType: hard
+
+"@firebase/database@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@firebase/database@npm:1.0.4"
+  dependencies:
+    "@firebase/app-check-interop-types": "npm:0.3.1"
+    "@firebase/auth-interop-types": "npm:0.2.2"
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    faye-websocket: "npm:0.11.4"
+    tslib: "npm:^2.1.0"
+  checksum: 92593ee52aa353758a01f35f7fcfb3121fee633c28c77dd042e53375fc4ce60fdffd0f2ce2accc6f85ab7a6c482dd688c7c9fa208561afa9fa013b1c2cebf328
+  languageName: node
+  linkType: hard
+
+"@firebase/firestore-compat@npm:0.3.29":
+  version: 0.3.29
+  resolution: "@firebase/firestore-compat@npm:0.3.29"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/firestore": "npm:4.6.0"
+    "@firebase/firestore-types": "npm:3.0.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: 651de02b5a07477d5a2911fee5dc82cc685adad82ab0f02bcf9c3a121dd929624d4cbcadb37134a470ecd80794dd282b604e3eddb57a17c884d54201a21d5edf
+  languageName: node
+  linkType: hard
+
+"@firebase/firestore-types@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@firebase/firestore-types@npm:3.0.1"
+  peerDependencies:
+    "@firebase/app-types": 0.x
+    "@firebase/util": 1.x
+  checksum: 4dbd0029d6196353b596ba7174abbbe1b183e6971a2ed95a9e2549801cfc3abe96f70d11def0bf3591f98be9d980802c4c2e9574c97b9c2365ba7b755362b786
+  languageName: node
+  linkType: hard
+
+"@firebase/firestore@npm:4.6.0":
+  version: 4.6.0
+  resolution: "@firebase/firestore@npm:4.6.0"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    "@firebase/webchannel-wrapper": "npm:0.10.6"
+    "@grpc/grpc-js": "npm:~1.9.0"
+    "@grpc/proto-loader": "npm:^0.7.8"
+    tslib: "npm:^2.1.0"
+    undici: "npm:5.28.4"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 5b95f29070fc97430480e6f1532071ce4a8755adfd4bd12aa5b424ed5ca29341e80862cd11fc8f075c5cc889b7e6f5352c852652097e2f07d489fcdbc83045bf
+  languageName: node
+  linkType: hard
+
+"@firebase/functions-compat@npm:0.3.10":
+  version: 0.3.10
+  resolution: "@firebase/functions-compat@npm:0.3.10"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/functions": "npm:0.11.4"
+    "@firebase/functions-types": "npm:0.6.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: 3ade94e619a20be50f2dbff834ff3a79e0f58da31ee664596edfcbd41741afbfe162c15bb38795109d4776ed75346f2accad5f6b75dbd1a963dc75676c91fee3
+  languageName: node
+  linkType: hard
+
+"@firebase/functions-types@npm:0.6.1":
+  version: 0.6.1
+  resolution: "@firebase/functions-types@npm:0.6.1"
+  checksum: 90a9a9bcb6a73027a87d71d8cfc5007a0085593f094d90fc42be1086d87ee560d711ab7c03856985bb4a8742150f4e2eda3ffaf3bc8749c83d16217c17efe535
+  languageName: node
+  linkType: hard
+
+"@firebase/functions@npm:0.11.4":
+  version: 0.11.4
+  resolution: "@firebase/functions@npm:0.11.4"
+  dependencies:
+    "@firebase/app-check-interop-types": "npm:0.3.1"
+    "@firebase/auth-interop-types": "npm:0.2.2"
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/messaging-interop-types": "npm:0.2.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+    undici: "npm:5.28.4"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 7cadc8bf72bef8828b4cd5c9b306a4f74420a3bc85ed8b8f43bb48977faeae0e56e4086b8c0f07277e2a18cd264e829d45f0d0b2f4520f66636396dcef93cbb9
+  languageName: node
+  linkType: hard
+
+"@firebase/installations-compat@npm:0.2.6":
+  version: 0.2.6
+  resolution: "@firebase/installations-compat@npm:0.2.6"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/installations": "npm:0.6.6"
+    "@firebase/installations-types": "npm:0.5.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: 6ef7f881af268b89749b38e7f6a2d039b8ac39606559a47e80c6636063d377ffb71f8221552ec5cd112ded3b603ab49dcab6f9d98f82576bdc8fc2ae7e4be0a4
+  languageName: node
+  linkType: hard
+
+"@firebase/installations-types@npm:0.5.1":
+  version: 0.5.1
+  resolution: "@firebase/installations-types@npm:0.5.1"
+  peerDependencies:
+    "@firebase/app-types": 0.x
+  checksum: 786cf890f1ada25cfd6382506f310fe8a3f0a37d7d5c33fb5f0bf8beb2f4f942e4a1e36b4d1dd4f3106c5cd9d440ab382c984036d7b1edef73fc01e20eefa1d6
+  languageName: node
+  linkType: hard
+
+"@firebase/installations@npm:0.6.6":
+  version: 0.6.6
+  resolution: "@firebase/installations@npm:0.6.6"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/util": "npm:1.9.5"
+    idb: "npm:7.1.1"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 29349d9e7f9c1dd547557d1bebfcc6b10143b36ba47fb1b377f92fc5bfcf6936ba1afb6779b2aabf4a66a5335a4438c897f6d83a953aecc8f68520f2feb6520a
+  languageName: node
+  linkType: hard
+
+"@firebase/logger@npm:0.4.1":
+  version: 0.4.1
+  resolution: "@firebase/logger@npm:0.4.1"
+  dependencies:
+    tslib: "npm:^2.1.0"
+  checksum: fc4af761deff0cdab7612d2124c162b5a5e38c2d9f123d14d4c9837cdd78537c9becbd889a00b753856ce69203824a9c0c4e62ad05c937c564a863c74db4b370
+  languageName: node
+  linkType: hard
+
+"@firebase/messaging-compat@npm:0.2.8":
+  version: 0.2.8
+  resolution: "@firebase/messaging-compat@npm:0.2.8"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/messaging": "npm:0.12.8"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: fd0376bc8c9249cb298f8a78c45f26716dd5e55581f49055fb8b7541f4216d531837621be680a3248423f7a2d2c8ef9ee2cec31a47356c012ca67e5410c9095a
+  languageName: node
+  linkType: hard
+
+"@firebase/messaging-interop-types@npm:0.2.1":
+  version: 0.2.1
+  resolution: "@firebase/messaging-interop-types@npm:0.2.1"
+  checksum: 976767932b40159890b6b4564ff63a06420de69bfb4e2334105db15134a273b5a36770743369d1eb02f6c8201c75fa5fb4ec3de34fc433fc56e011a11eaafde4
+  languageName: node
+  linkType: hard
+
+"@firebase/messaging@npm:0.12.8":
+  version: 0.12.8
+  resolution: "@firebase/messaging@npm:0.12.8"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/installations": "npm:0.6.6"
+    "@firebase/messaging-interop-types": "npm:0.2.1"
+    "@firebase/util": "npm:1.9.5"
+    idb: "npm:7.1.1"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 0774b12d048afcbf190093c693693b3facdec7f70f034f1f662e7e42488f69a3984f45e867c05f61f0011091512457a98087981d32bb17b53941494e3718963a
+  languageName: node
+  linkType: hard
+
+"@firebase/performance-compat@npm:0.2.6":
+  version: 0.2.6
+  resolution: "@firebase/performance-compat@npm:0.2.6"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/performance": "npm:0.6.6"
+    "@firebase/performance-types": "npm:0.2.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: 0870b7c05dfcdff62dc712e4a500abed117154f359e3b43484c8207518517de1e8cb6546ba7035ef90e45bebb13f7d679a252a6ea3ec135b1b7f8cdc5068bf1b
+  languageName: node
+  linkType: hard
+
+"@firebase/performance-types@npm:0.2.1":
+  version: 0.2.1
+  resolution: "@firebase/performance-types@npm:0.2.1"
+  checksum: c5186a33f2d1a5d581e57318a338099a8eb76fdd5de68c13965836338a8533178a97438ac259fa9d335b86f75f40c5b70a4387750eba85f986dcd86bf1ad2182
+  languageName: node
+  linkType: hard
+
+"@firebase/performance@npm:0.6.6":
+  version: 0.6.6
+  resolution: "@firebase/performance@npm:0.6.6"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/installations": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 331e12bdd34c416e5142037c4786c233288c7850ea8877d4ae1cec990cdd0b80f26f30ab40432a2358550722e66a52e26941bd5575419c76f204a97ce18298d3
+  languageName: node
+  linkType: hard
+
+"@firebase/remote-config-compat@npm:0.2.6":
+  version: 0.2.6
+  resolution: "@firebase/remote-config-compat@npm:0.2.6"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/remote-config": "npm:0.4.6"
+    "@firebase/remote-config-types": "npm:0.3.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: 4593117743af6cbf22703d3e6736cfa1c63813ee64299ada3e4ae696c9ee3dc4ece5d6f153110ca5c58d0818755e790a730b6dd61744ac69b6cfda9036db1204
+  languageName: node
+  linkType: hard
+
+"@firebase/remote-config-types@npm:0.3.1":
+  version: 0.3.1
+  resolution: "@firebase/remote-config-types@npm:0.3.1"
+  checksum: bba5869f28b2abc80b2b498c1bf11c0aa1e69a5725868a2e698c3db3afaaebb15e90ff8aabe983771785a15c8d9567a8a3a751e8c7e41e609659fbec47b3b959
+  languageName: node
+  linkType: hard
+
+"@firebase/remote-config@npm:0.4.6":
+  version: 0.4.6
+  resolution: "@firebase/remote-config@npm:0.4.6"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/installations": "npm:0.6.6"
+    "@firebase/logger": "npm:0.4.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 7a2a3bfd96c70b016bedf05a9ffde6ff8979a54f851086d115d1c3d8390a2e56085a344c0d270951d4adb55b71e1587c2cb890af9f612fda14b3337a2e7f88cd
+  languageName: node
+  linkType: hard
+
+"@firebase/storage-compat@npm:0.3.7":
+  version: 0.3.7
+  resolution: "@firebase/storage-compat@npm:0.3.7"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/storage": "npm:0.12.4"
+    "@firebase/storage-types": "npm:0.8.1"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+  peerDependencies:
+    "@firebase/app-compat": 0.x
+  checksum: 263234f8d3112d997c26c686ca2a8bfcd8c1fe4b817bd7af2cc83da5376000df79ebd93f1af82a73fdf7951e17eec9ab21decd02b9ee0c6029022595ba8e83cc
+  languageName: node
+  linkType: hard
+
+"@firebase/storage-types@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@firebase/storage-types@npm:0.8.1"
+  peerDependencies:
+    "@firebase/app-types": 0.x
+    "@firebase/util": 1.x
+  checksum: 84ccf99f048a1067f4f05d94915f2a3f9b2ba92984ef17a956268bcddcae878dfa8a8336726bb54472f8babb9d14eab776be5b45ef3e5e7f2a008e2565cb8be8
+  languageName: node
+  linkType: hard
+
+"@firebase/storage@npm:0.12.4":
+  version: 0.12.4
+  resolution: "@firebase/storage@npm:0.12.4"
+  dependencies:
+    "@firebase/component": "npm:0.6.6"
+    "@firebase/util": "npm:1.9.5"
+    tslib: "npm:^2.1.0"
+    undici: "npm:5.28.4"
+  peerDependencies:
+    "@firebase/app": 0.x
+  checksum: 0186ce9051cc5f8be3d92f15df64312baa0d9c13b50e20cbe5f54122cdcae547aae8d3061b69f0005e9df96af7785c41a912c6e376ad3b1ee723561a46705bf8
+  languageName: node
+  linkType: hard
+
+"@firebase/util@npm:1.9.5":
+  version: 1.9.5
+  resolution: "@firebase/util@npm:1.9.5"
+  dependencies:
+    tslib: "npm:^2.1.0"
+  checksum: 6827bdad90465bc53616db2fbb71f226106c976ec48c2fd82bf7b550f610e050734eba70aa6b49e6bd4cbdeb34972484d0740c2d17db137efae3e8cef235480d
+  languageName: node
+  linkType: hard
+
+"@firebase/webchannel-wrapper@npm:0.10.6":
+  version: 0.10.6
+  resolution: "@firebase/webchannel-wrapper@npm:0.10.6"
+  checksum: ea09096fb197f7353141005cf34ffd249d02d03a8927cf535dc13293bbfe83b16dd6317c29383b7202a052b9ad59b66ff65e52a53d2314831e1bc7d0ddabfd94
+  languageName: node
+  linkType: hard
+
 "@fivebinaries/coin-selection@npm:2.2.1":
   version: 2.2.1
   resolution: "@fivebinaries/coin-selection@npm:2.2.1"
@@ -3000,6 +3544,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@grpc/grpc-js@npm:~1.9.0":
+  version: 1.9.14
+  resolution: "@grpc/grpc-js@npm:1.9.14"
+  dependencies:
+    "@grpc/proto-loader": "npm:^0.7.8"
+    "@types/node": "npm:>=12.12.47"
+  checksum: 417f8ce1b0a529b05f18f1432ccbe257ad4b305ad04b548dcc502adcffde48dfaa4f392e71cb782bfebc1fa23c1f32baed83da368d8c05296da0a243020a60d2
+  languageName: node
+  linkType: hard
+
+"@grpc/proto-loader@npm:^0.7.8":
+  version: 0.7.12
+  resolution: "@grpc/proto-loader@npm:0.7.12"
+  dependencies:
+    lodash.camelcase: "npm:^4.3.0"
+    long: "npm:^5.0.0"
+    protobufjs: "npm:^7.2.4"
+    yargs: "npm:^17.7.2"
+  bin:
+    proto-loader-gen-types: build/bin/proto-loader-gen-types.js
+  checksum: c8a9f915d44881ca7dce108dfb81d853912d95d756308f1ea6b688f63c5342ada4fe0a7cfacc0b28f89a77a4e65cce91fad99e65d5ae49b3d4e1ec4863f84ad4
+  languageName: node
+  linkType: hard
+
 "@gulp-sourcemaps/identity-map@npm:^2.0.1":
   version: 2.0.1
   resolution: "@gulp-sourcemaps/identity-map@npm:2.0.1"
@@ -3388,14 +3956,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/gen-mapping@npm:0.3.2"
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2, @jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
-    "@jridgewell/set-array": "npm:^1.0.1"
+    "@jridgewell/set-array": "npm:^1.2.1"
     "@jridgewell/sourcemap-codec": "npm:^1.4.10"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 7ba0070be1aeda7d7694b09d847c3b95879409b26559b9d7e97a88ec94b838fb380df43ae328ee2d2df4d79e75d7afe6ba315199d18d79aa20839ebdfb739420
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 81587b3c4dd8e6c60252122937cea0c637486311f4ed208b52b62aae2e7a87598f63ec330e6cd0984af494bfb16d3f0d60d3b21d7e5b4aedd2602ff3fe9d32e2
   languageName: node
   linkType: hard
 
@@ -3406,20 +3974,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10
   languageName: node
   linkType: hard
 
-"@jridgewell/source-map@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/source-map@npm:0.3.2"
+"@jridgewell/source-map@npm:^0.3.3":
+  version: 0.3.6
+  resolution: "@jridgewell/source-map@npm:0.3.6"
   dependencies:
-    "@jridgewell/gen-mapping": "npm:^0.3.0"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 1aaa42075bac32a551708025da0c07b11c11fb05ccd10fb70df2cb0db88773338ab0f33f175d9865379cb855bb3b1cda478367747a1087309fda40a7b9214bfa
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+  checksum: 0a9aca9320dc9044014ba0ef989b3a8411b0d778895553e3b7ca2ac0a75a20af4a5ad3f202acfb1879fa40466036a4417e1d5b38305baed8b9c1ebe6e4b3e7f5
   languageName: node
   linkType: hard
 
@@ -3440,13 +4008,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.19
-  resolution: "@jridgewell/trace-mapping@npm:0.3.19"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
     "@jridgewell/resolve-uri": "npm:^3.1.0"
     "@jridgewell/sourcemap-codec": "npm:^1.4.14"
-  checksum: 06a2a4e26e3cc369c41144fad7cbee29ba9ea6aca85acc565ec8f2110e298fdbf93986e17da815afae94539dcc03115cdbdbb575d3bea356e167da6987531e4d
+  checksum: dced32160a44b49d531b80a4a2159dceab6b3ddf0c8e95a0deae4b0e894b172defa63d5ac52a19c2068e1fe7d31ea4ba931fbeec103233ecb4208953967120fc
   languageName: node
   linkType: hard
 
@@ -3797,88 +4365,88 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-controller@npm:^0.2.23, @metamask-institutional/custody-controller@npm:^0.2.24":
-  version: 0.2.24
-  resolution: "@metamask-institutional/custody-controller@npm:0.2.24"
+"@metamask-institutional/custody-controller@npm:^0.2.27":
+  version: 0.2.27
+  resolution: "@metamask-institutional/custody-controller@npm:0.2.27"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
-    "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/types": "npm:^1.0.4"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/types": "npm:^1.1.0"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: 6815d46eeb97d0d9188eba2af5c948f281ed554f3d920905431d3093bb864a9a43aebea6a773f59d5e34e8d4c2f7cbca0d2c4eff6bb8c4e05595505af5bbfccc
+  checksum: b834477c4551fdbd56143742038f1b101cb72b1655380a63d6d84416af949b259109a22967d3233009d737400f656c91ba100dcb61522eb14e6715564f07e404
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-keyring@npm:^1.0.11, @metamask-institutional/custody-keyring@npm:^1.0.12":
-  version: 1.0.12
-  resolution: "@metamask-institutional/custody-keyring@npm:1.0.12"
+"@metamask-institutional/custody-keyring@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask-institutional/custody-keyring@npm:2.0.0"
   dependencies:
     "@ethereumjs/tx": "npm:^4.1.1"
     "@ethereumjs/util": "npm:^8.0.5"
     "@metamask-institutional/configuration-client": "npm:^2.0.1"
-    "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/types": "npm:^1.0.4"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/types": "npm:^1.1.0"
     "@metamask/obs-store": "npm:^8.0.0"
     crypto: "npm:^1.0.1"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: adc993dcfd86aaf263567f26aea88fd76b69aae76380d266d68f5aaf28b9b37c8d44e8849e1479ab8febed65bbe9f84b203e702ba11e4ba6e350c8ba09b2bc43
+  checksum: 14563443d157d97554ab4456c69ecba52aacde9659bcdc5b20724a3cf7c626c3ef624446823ceafbf3aa25307e89f0dc09636e8db49f49f48d5d7c6b37f52bf9
   languageName: node
   linkType: hard
 
-"@metamask-institutional/extension@npm:^0.3.19":
-  version: 0.3.20
-  resolution: "@metamask-institutional/extension@npm:0.3.20"
+"@metamask-institutional/extension@npm:^0.3.24":
+  version: 0.3.24
+  resolution: "@metamask-institutional/extension@npm:0.3.24"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-controller": "npm:^0.2.24"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
-    "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
-    "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/transaction-update": "npm:^0.1.38"
-    "@metamask-institutional/types": "npm:^1.0.4"
+    "@metamask-institutional/custody-controller": "npm:^0.2.27"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/transaction-update": "npm:^0.2.2"
+    "@metamask-institutional/types": "npm:^1.1.0"
     jest-create-mock-instance: "npm:^2.0.0"
     jest-fetch-mock: "npm:3.0.3"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: bacb836f2dd20d7800ec6062185359d5c32720be1db06700d6b96b902968f7860195564bbf532a8524d2a03b15d0c031520d96dafb7aa78f5a0bf5a3ec512d0b
+  checksum: 7ec773d3f98b61d4d6b877e39eec239aca3cb5accaa2211728ddbad32fb6dba5f1c2e7ac7e90e1606bf94995f78dd323cb64a06fa587fd435b7e1592515f73ab
   languageName: node
   linkType: hard
 
-"@metamask-institutional/institutional-features@npm:^1.2.14":
-  version: 1.2.15
-  resolution: "@metamask-institutional/institutional-features@npm:1.2.15"
+"@metamask-institutional/institutional-features@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "@metamask-institutional/institutional-features@npm:1.3.2"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: c67421567e85e34b9c8de8460ff8836cf0acf04d06927273c3120eb2dc8748294f6aa5690dbf587d886155842b66b6464957b9ff30d1d78a8e1931e2f119e77d
+  checksum: be5e8722c1180cf7127ee4c7cab0b26a60cb56e7bf0147836b496496bc6ada4de3e0265b97118ba4229ae6a847188097ed7175d51d689c5898e381fe54707aa9
   languageName: node
   linkType: hard
 
-"@metamask-institutional/portfolio-dashboard@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@metamask-institutional/portfolio-dashboard@npm:1.4.0"
-  checksum: c973305d5b4088d5ae45300fc016f3cbc15232d1c8b734201a352b2296de8f21d0c1e5d9bfc6d1d164e5784e5128aaf2f6ca4370a9f6e99db3f5685a8266a5a0
+"@metamask-institutional/portfolio-dashboard@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@metamask-institutional/portfolio-dashboard@npm:1.4.1"
+  checksum: 75573d236d2dd709bcf8d0c92f69eb71f07de4ed02ef3f5122f2acf5cf29e41c9e17b14c67cea4f200e64ce2e9a6c60bc5e85508f77aa904f9bbbcf65e5efb10
   languageName: node
   linkType: hard
 
-"@metamask-institutional/rpc-allowlist@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@metamask-institutional/rpc-allowlist@npm:1.0.2"
-  checksum: 34939415457c5856c49c01330de976e276d5525b9ca4bdf5eca55570ccb47be77a809bf3a6eb05f817bd91c981e8614b573385e0b9ed7b218233d4b559e58b75
+"@metamask-institutional/rpc-allowlist@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "@metamask-institutional/rpc-allowlist@npm:1.0.3"
+  checksum: caed69a7855328d3261f7499bc024c772fc61f050c574c9e76a0dc565779e9d842a89ed01af33eaf268ac6b3b3624be7b7a8183329f734d08751ee98d5c18472
   languageName: node
   linkType: hard
 
-"@metamask-institutional/sdk@npm:^0.1.25":
-  version: 0.1.25
-  resolution: "@metamask-institutional/sdk@npm:0.1.25"
+"@metamask-institutional/sdk@npm:^0.1.26, @metamask-institutional/sdk@npm:^0.1.27":
+  version: 0.1.27
+  resolution: "@metamask-institutional/sdk@npm:0.1.27"
   dependencies:
     "@metamask-institutional/simplecache": "npm:^1.1.0"
-    "@metamask-institutional/types": "npm:^1.0.4"
+    "@metamask-institutional/types": "npm:^1.1.0"
     "@types/jsonwebtoken": "npm:^9.0.1"
     "@types/node": "npm:^20.11.17"
     bignumber.js: "npm:^9.1.1"
     jsonwebtoken: "npm:^9.0.0"
-  checksum: ac9fc0d50c7963745ae96e7ba7a845217ff3681571f2ce8729f42e5dc903d4fb1df13fcc1465b2246c551b331e30a685deccbc56e89dd7070d83bdc5c3fe912b
+  checksum: 9de0d737cab194c8f16a63f92bade1265667f2042c4449bdde60240afb09cdfb71c2b583fbd629a9c72c43530b8d6816def91601aa517c8b47b0b2d473095397
   languageName: node
   linkType: hard
 
@@ -3889,36 +4457,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/transaction-update@npm:^0.1.37, @metamask-institutional/transaction-update@npm:^0.1.38":
-  version: 0.1.38
-  resolution: "@metamask-institutional/transaction-update@npm:0.1.38"
+"@metamask-institutional/transaction-update@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "@metamask-institutional/transaction-update@npm:0.2.2"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
-    "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/types": "npm:^1.0.4"
-    "@metamask-institutional/websocket-client": "npm:^0.1.40"
+    "@ethereumjs/util": "npm:^8.0.5"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/types": "npm:^1.1.0"
+    "@metamask-institutional/websocket-client": "npm:^0.2.2"
     "@metamask/obs-store": "npm:^8.0.0"
-    ethereumjs-util: "npm:^7.1.5"
-  checksum: 4dac477b175c870545f48e57ed6d3bb503f69bed0fb50e909ca630080c9427b44a2a44a82f16abfc289cd302ffdb82306b725faf20a4a6d2395938e657821650
+  checksum: 31c62a2d207e8e3c2469b870eecb18ff2db450eda8b28c2d428a69cc9eee8a477142f74abebad50c62a6e0f1132dafa8db6b8bf95f43677a401a54b4d3cd5fd0
   languageName: node
   linkType: hard
 
-"@metamask-institutional/types@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@metamask-institutional/types@npm:1.0.4"
-  checksum: 2fc4f2de93f8cf030f3f9e180f2b99a3c1354ce85fb0ba0dc03e63c42b330df4554c571ed30cf5787856ebdab65bc3b69471a5aab35552fd6ea5f6684315d495
+"@metamask-institutional/types@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@metamask-institutional/types@npm:1.1.0"
+  checksum: 76f3c8529e4fe549bcabe60c39a66dd1a526aa7ea16fe7949e960a884d2c9e5e2e65db4d1123e23eeaae46f88b10aafe365cc693f5f632ef1a8e407373fe2fdf
   languageName: node
   linkType: hard
 
-"@metamask-institutional/websocket-client@npm:^0.1.40":
-  version: 0.1.40
-  resolution: "@metamask-institutional/websocket-client@npm:0.1.40"
+"@metamask-institutional/websocket-client@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "@metamask-institutional/websocket-client@npm:0.2.2"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.0.12"
-    "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/types": "npm:^1.0.4"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/types": "npm:^1.1.0"
     mock-socket: "npm:^9.2.1"
-  checksum: c1cef7416fb40778403e4e34225a948fa6849266c12fa42ff645d208429a5f55441c8cd0be121d0b525098e3d96e3f529f059bc76480497da97e8ab7b7f6924d
+  checksum: 652ffded926f5064e543e15e01992ec37a588783bc711a6f74404c1984ac5406fa83ab19187f00ae9b81a182cb46be08b0be388f583d68d6b45500969b5b2f46
   languageName: node
   linkType: hard
 
@@ -3954,27 +4522,49 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/address-book-controller@npm:^3.1.7":
-  version: 3.1.7
-  resolution: "@metamask/address-book-controller@npm:3.1.7"
+"@metamask/accounts-controller@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "@metamask/accounts-controller@npm:14.0.0"
   dependencies:
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/controller-utils": "npm:^8.0.2"
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/eth-snap-keyring": "npm:^4.0.0"
+    "@metamask/keyring-api": "npm:^6.0.0"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
+    "@metamask/snaps-utils": "npm:^7.1.0"
     "@metamask/utils": "npm:^8.3.0"
-  checksum: e91c41dc2c88932b7a0e49734ea4205b27789e56c12c9c1d6ee7cbc971917896d195e368b10b8351689992de67ca6372461c2be52aca2a85618b788597be607b
+    deepmerge: "npm:^4.2.2"
+    ethereum-cryptography: "npm:^2.1.2"
+    immer: "npm:^9.0.6"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@metamask/keyring-controller": ^16.0.0
+    "@metamask/snaps-controllers": ^7.0.1
+  checksum: c9ab5c5a26badf0c4161bdfbf41eb2d67ed2e6c59454a7a3176255c59aa94e45ea26452a08b112b457a62958786877df2ca6b51ff6e8be31094993f2bd974fbf
   languageName: node
   linkType: hard
 
-"@metamask/announcement-controller@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@metamask/announcement-controller@npm:5.0.1"
+"@metamask/address-book-controller@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@metamask/address-book-controller@npm:4.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^4.0.1"
-  checksum: 25198a8e8a4feddb984269dad516fc20aa458cdeb183fe0c3b0dbc9973cbaf753cdaf4b97b54ce0b3c4456b0d1c65b18e750248131127792cb5f7327ed0b56de
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/controller-utils": "npm:^9.0.1"
+    "@metamask/utils": "npm:^8.3.0"
+  checksum: 6d2d8bba15422249e2a1bf148e442712733717d33ba60d02fd76212de58d9d2e15e711b417b64dbbded1b4a545f6196709a8e5e4d584a3e1da265f5bd5cc3653
   languageName: node
   linkType: hard
 
-"@metamask/approval-controller@npm:^5.1.1, @metamask/approval-controller@npm:^5.1.2, @metamask/approval-controller@npm:^5.1.3":
+"@metamask/announcement-controller@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "@metamask/announcement-controller@npm:6.1.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^5.0.1"
+  checksum: 036bbbfbda9366a41ab94ab424eb25567d0503a723a2e4e24ed14b8576de46be093470a29457c1fb50faeabcc5c70a4cb8c3a49029298cba7f9b3ce28fa117ed
+  languageName: node
+  linkType: hard
+
+"@metamask/approval-controller@npm:^5.1.1, @metamask/approval-controller@npm:^5.1.2":
   version: 5.1.3
   resolution: "@metamask/approval-controller@npm:5.1.3"
   dependencies:
@@ -3986,63 +4576,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/approval-controller@npm:^6.0.0, @metamask/approval-controller@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "@metamask/approval-controller@npm:6.0.1"
+"@metamask/approval-controller@npm:^6.0.1, @metamask/approval-controller@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "@metamask/approval-controller@npm:6.0.2"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/base-controller": "npm:^5.0.2"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/utils": "npm:^8.3.0"
     nanoid: "npm:^3.1.31"
-  checksum: f7c61caf2fffb64c93ad4aa195bf251447367ed96ce207ac1b78327a6a2d5ae68705521735baafa8af8366f1b35ddbd398a15cfdb18082fd7218e2c26fcd42d9
-  languageName: node
-  linkType: hard
-
-"@metamask/assets-controllers@npm:26.0.0":
-  version: 26.0.0
-  resolution: "@metamask/assets-controllers@npm:26.0.0"
-  dependencies:
-    "@ethereumjs/util": "npm:^8.1.0"
-    "@ethersproject/address": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/contracts": "npm:^5.7.0"
-    "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/abi-utils": "npm:^2.0.2"
-    "@metamask/accounts-controller": "npm:^11.0.0"
-    "@metamask/approval-controller": "npm:^5.1.3"
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/contract-metadata": "npm:^2.4.0"
-    "@metamask/controller-utils": "npm:^8.0.4"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/keyring-controller": "npm:^13.0.0"
-    "@metamask/metamask-eth-abis": "npm:3.0.0"
-    "@metamask/network-controller": "npm:^17.2.1"
-    "@metamask/polling-controller": "npm:^5.0.1"
-    "@metamask/preferences-controller": "npm:^8.0.0"
-    "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/utils": "npm:^8.3.0"
-    "@types/bn.js": "npm:^5.1.5"
-    "@types/uuid": "npm:^8.3.0"
-    async-mutex: "npm:^0.2.6"
-    bn.js: "npm:^5.2.1"
-    cockatiel: "npm:^3.1.2"
-    lodash: "npm:^4.17.21"
-    multiformats: "npm:^9.5.2"
-    single-call-balance-checker-abi: "npm:^1.0.0"
-    uuid: "npm:^8.3.2"
-  peerDependencies:
-    "@metamask/accounts-controller": ^11.0.0
-    "@metamask/approval-controller": ^5.1.2
-    "@metamask/keyring-controller": ^13.0.0
-    "@metamask/network-controller": ^17.2.0
-    "@metamask/preferences-controller": ^8.0.0
-  checksum: ef59cf79ed9f69bce485d690df5eea6ce0ffc5ec021396a439f0e8467af6978d140709e95d1edfca394a679968d4eebb9a96e222961d16166f7eaf0ae2fb8774
+  checksum: 63fae925a9792ef8bdc8ec7be39e4f303fbcd676a2349a0e40b7734958b7712e0454acd2cb338fc368d220e89377f9825f50868145796e94da41d631cb499908
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch":
-  version: 26.0.0
-  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch::version=26.0.0&hash=cf1d54"
+"@metamask/assets-controllers@npm:^29.0.0":
+  version: 29.0.0
+  resolution: "@metamask/assets-controllers@npm:29.0.0"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@ethersproject/address": "npm:^5.7.0"
@@ -4050,17 +4598,17 @@ __metadata:
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/abi-utils": "npm:^2.0.2"
-    "@metamask/accounts-controller": "npm:^11.0.0"
-    "@metamask/approval-controller": "npm:^5.1.3"
-    "@metamask/base-controller": "npm:^4.1.1"
+    "@metamask/accounts-controller": "npm:^14.0.0"
+    "@metamask/approval-controller": "npm:^6.0.2"
+    "@metamask/base-controller": "npm:^5.0.2"
     "@metamask/contract-metadata": "npm:^2.4.0"
-    "@metamask/controller-utils": "npm:^8.0.4"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/keyring-controller": "npm:^13.0.0"
-    "@metamask/metamask-eth-abis": "npm:3.0.0"
-    "@metamask/network-controller": "npm:^17.2.1"
-    "@metamask/polling-controller": "npm:^5.0.1"
-    "@metamask/preferences-controller": "npm:^8.0.0"
+    "@metamask/keyring-controller": "npm:^16.0.0"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/network-controller": "npm:^18.1.0"
+    "@metamask/polling-controller": "npm:^6.0.2"
+    "@metamask/preferences-controller": "npm:^11.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/utils": "npm:^8.3.0"
     "@types/bn.js": "npm:^5.1.5"
@@ -4073,12 +4621,12 @@ __metadata:
     single-call-balance-checker-abi: "npm:^1.0.0"
     uuid: "npm:^8.3.2"
   peerDependencies:
-    "@metamask/accounts-controller": ^11.0.0
-    "@metamask/approval-controller": ^5.1.2
-    "@metamask/keyring-controller": ^13.0.0
-    "@metamask/network-controller": ^17.2.0
-    "@metamask/preferences-controller": ^8.0.0
-  checksum: 44e0ce87c9a2e4e161771c212460947629502ad6e72542e87a29a3de6e9c6665190396a2ae7d8206e57ad091cb80ad6634dfbfd254632a5ee6833c496f1ad0ad
+    "@metamask/accounts-controller": ^14.0.0
+    "@metamask/approval-controller": ^6.0.0
+    "@metamask/keyring-controller": ^16.0.0
+    "@metamask/network-controller": ^18.0.0
+    "@metamask/preferences-controller": ^11.0.0
+  checksum: e200e5e9dbfd5a3277c08db3f9c45a9dcfb1b50954edc7f914d8cea8bef15982ee5cd559072e0970aa88d497e7b5d0cf48d601290e5659633489ac6ba5c4fb13
   languageName: node
   linkType: hard
 
@@ -4096,7 +4644,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/base-controller@npm:^3.0.0, @metamask/base-controller@npm:^3.2.1":
+"@metamask/base-controller@npm:^3.0.0":
   version: 3.2.3
   resolution: "@metamask/base-controller@npm:3.2.3"
   dependencies:
@@ -4116,13 +4664,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/base-controller@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@metamask/base-controller@npm:5.0.1"
+"@metamask/base-controller@npm:^5.0.1, @metamask/base-controller@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@metamask/base-controller@npm:5.0.2"
   dependencies:
     "@metamask/utils": "npm:^8.3.0"
     immer: "npm:^9.0.6"
-  checksum: 62fe2c0047ea5ae88821ab6bf3e2d72f1b732a9157cd0632a4309721fe84b7e07c21ecdbf24eebfc742d00a53963e9b72bc1bc45540ce1075cf5407cec50d8a2
+  checksum: f9c142766d8cdb69c0cc93aa5cfdaeae97a8c126a5f30f75d31bfdebbc57e82574dc5a3743eceb9e3106d182d066d1517fb73991bb2d06d861d25fd1dac87dcc
   languageName: node
   linkType: hard
 
@@ -4145,14 +4693,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/contract-metadata@npm:^2.3.1, @metamask/contract-metadata@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "@metamask/contract-metadata@npm:2.4.0"
-  checksum: 09829751ec3239cb06b74ee338207a802e4c0e7b0184e2b2a3e43c1c043bb6cc432081b6375707d3a5cbe0870502729c2d4c6aa3dd040a2e66432275b47a32ec
+"@metamask/contract-metadata@npm:^2.4.0, @metamask/contract-metadata@npm:^2.5.0":
+  version: 2.5.0
+  resolution: "@metamask/contract-metadata@npm:2.5.0"
+  checksum: 462b3ec7b32311ff5e6eec001abf25143e67ee667c70e0b9a3dee7545e7fc245b8098856ae79fef9758ef1db4930fa1d1d7681410995520935f2885bdb9641d2
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:8.0.4, @metamask/controller-utils@npm:^8.0.1, @metamask/controller-utils@npm:^8.0.2, @metamask/controller-utils@npm:^8.0.3, @metamask/controller-utils@npm:^8.0.4":
+"@metamask/controller-utils@npm:^8.0.1, @metamask/controller-utils@npm:^8.0.2, @metamask/controller-utils@npm:^8.0.4":
   version: 8.0.4
   resolution: "@metamask/controller-utils@npm:8.0.4"
   dependencies:
@@ -4167,50 +4715,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:^5.0.0":
-  version: 5.0.2
-  resolution: "@metamask/controller-utils@npm:5.0.2"
-  dependencies:
-    "@metamask/eth-query": "npm:^3.0.1"
-    "@metamask/utils": "npm:^8.1.0"
-    "@spruceid/siwe-parser": "npm:1.1.3"
-    eth-ens-namehash: "npm:^2.0.8"
-    ethereumjs-util: "npm:^7.0.10"
-    ethjs-unit: "npm:^0.1.6"
-    fast-deep-equal: "npm:^3.1.3"
-  checksum: fde3d4893ddd408e1b6138180d53568e27626b5884a404473a3e75d4615ba4525aa33deb21a24a438ff0928431d278efd9c084e9aca7eeaaf2a1c300691318d5
-  languageName: node
-  linkType: hard
-
-"@metamask/controller-utils@npm:^9.0.1, @metamask/controller-utils@npm:^9.0.2":
-  version: 9.0.2
-  resolution: "@metamask/controller-utils@npm:9.0.2"
+"@metamask/controller-utils@npm:^9.0.1, @metamask/controller-utils@npm:^9.0.2, @metamask/controller-utils@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "@metamask/controller-utils@npm:9.1.0"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/ethjs-unit": "npm:^0.3.0"
     "@metamask/utils": "npm:^8.3.0"
-    "@spruceid/siwe-parser": "npm:1.1.3"
+    "@spruceid/siwe-parser": "npm:2.1.0"
     "@types/bn.js": "npm:^5.1.5"
     bn.js: "npm:^5.2.1"
     eth-ens-namehash: "npm:^2.0.8"
     fast-deep-equal: "npm:^3.1.3"
-  checksum: edf8f23d349da01bb9e9906bc2825612eaa422f5c13d19b820ee84c3366d79900f9cd98e6e89b02b9ffd241510c1d7615b99b4263ce79a43d88ad4dffdb028f7
-  languageName: node
-  linkType: hard
-
-"@metamask/controller-utils@patch:@metamask/controller-utils@npm%3A8.0.4#~/.yarn/patches/@metamask-controller-utils-npm-8.0.4-077edd6162.patch":
-  version: 8.0.4
-  resolution: "@metamask/controller-utils@patch:@metamask/controller-utils@npm%3A8.0.4#~/.yarn/patches/@metamask-controller-utils-npm-8.0.4-077edd6162.patch::version=8.0.4&hash=0d2618"
-  dependencies:
-    "@ethereumjs/util": "npm:^8.1.0"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/ethjs-unit": "npm:^0.3.0"
-    "@metamask/utils": "npm:^8.3.0"
-    "@spruceid/siwe-parser": "npm:1.1.3"
-    eth-ens-namehash: "npm:^2.0.8"
-    fast-deep-equal: "npm:^3.1.3"
-  checksum: 280f8250164bfce90dba0151bd008ce03cc12a3272802d7056d8eae9f294020d4ef7dad22ed88d720651e6c3171203dc40c911875b78adcc4a6bc47ed91d9977
+  checksum: cc17c0574eea34d80265d39c7410a3cb4ec5718d26f3e1f4252616ae31b431f817754b37c542d9707640508dc1a1dc2a705fc6d51ccc65f84a1ccaec1d7e6c8e
   languageName: node
   linkType: hard
 
@@ -4322,6 +4840,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eslint-plugin-design-tokens@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@metamask/eslint-plugin-design-tokens@npm:1.1.0"
+  checksum: 21ee903ed25eb1edb3b6f4fc4e426dc48bde0ad5d338618b5b820a11dc5f33a2706527063dca8b50e9049d3c6743781c5ae33d5860088deabc1f250659815a94
+  languageName: node
+  linkType: hard
+
 "@metamask/eth-hd-keyring@npm:^7.0.1":
   version: 7.0.1
   resolution: "@metamask/eth-hd-keyring@npm:7.0.1"
@@ -4400,38 +4925,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-keyring-controller@npm:^16.0.0":
-  version: 16.0.0
-  resolution: "@metamask/eth-keyring-controller@npm:16.0.0"
-  dependencies:
-    "@ethereumjs/tx": "npm:^4.2.0"
-    "@metamask/browser-passworder": "npm:^4.3.0"
-    "@metamask/eth-hd-keyring": "npm:^7.0.1"
-    "@metamask/eth-sig-util": "npm:^7.0.0"
-    "@metamask/eth-simple-keyring": "npm:^6.0.1"
-    "@metamask/keyring-api": "npm:^2.0.0"
-    "@metamask/obs-store": "npm:^9.0.0"
-    "@metamask/utils": "npm:^8.2.0"
-  checksum: c935e4b9fd2845cd069c6dd3dff9378693af8fb0d81263e4dac1e6bdc944fa7ad0c5209cfd870bb1749aa1a5825007ff4cbdc0caf869353de1357ddaf2eb84dc
-  languageName: node
-  linkType: hard
-
-"@metamask/eth-keyring-controller@npm:^17.0.1":
-  version: 17.0.1
-  resolution: "@metamask/eth-keyring-controller@npm:17.0.1"
-  dependencies:
-    "@ethereumjs/tx": "npm:^4.2.0"
-    "@metamask/browser-passworder": "npm:^4.3.0"
-    "@metamask/eth-hd-keyring": "npm:^7.0.1"
-    "@metamask/eth-sig-util": "npm:^7.0.0"
-    "@metamask/eth-simple-keyring": "npm:^6.0.1"
-    "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/obs-store": "npm:^9.0.0"
-    "@metamask/utils": "npm:^8.2.0"
-  checksum: 1b56eb67a53ed743eae95fc630ea45fb3c7639823391ef452d8f1153d2d5242e29622717e8a07afa70a8ca3608966cd3d9a61079e18e8514d7b852dc8357e374
-  languageName: node
-  linkType: hard
-
 "@metamask/eth-ledger-bridge-keyring@npm:^2.0.1":
   version: 2.0.1
   resolution: "@metamask/eth-ledger-bridge-keyring@npm:2.0.1"
@@ -4510,6 +5003,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eth-snap-keyring@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@metamask/eth-snap-keyring@npm:4.0.0"
+  dependencies:
+    "@ethereumjs/tx": "npm:^4.2.0"
+    "@metamask/eth-sig-util": "npm:^7.0.1"
+    "@metamask/keyring-api": "npm:^6.0.0"
+    "@metamask/snaps-controllers": "npm:^7.0.1"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
+    "@metamask/snaps-utils": "npm:^7.0.3"
+    "@metamask/utils": "npm:^8.4.0"
+    "@types/uuid": "npm:^9.0.1"
+    superstruct: "npm:^1.0.3"
+    uuid: "npm:^9.0.0"
+  checksum: 6f5a89ae400356a0f545f798d61d3cf1deb2dc17a24a9ab7304a5851a06be946573fe594787321d12cd1599ad86b61570bd43d7f700a23fb1aa65e52f981e118
+  languageName: node
+  linkType: hard
+
 "@metamask/eth-token-tracker@npm:^7.0.2":
   version: 7.0.2
   resolution: "@metamask/eth-token-tracker@npm:7.0.2"
@@ -4674,58 +5185,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/gas-fee-controller@npm:14.0.1":
-  version: 14.0.1
-  resolution: "@metamask/gas-fee-controller@npm:14.0.1"
-  dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/ethjs-unit": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^18.0.1"
-    "@metamask/polling-controller": "npm:^6.0.1"
-    "@metamask/utils": "npm:^8.3.0"
-    "@types/bn.js": "npm:^5.1.5"
-    "@types/uuid": "npm:^8.3.0"
-    bn.js: "npm:^5.2.1"
-    uuid: "npm:^8.3.2"
-  peerDependencies:
-    "@metamask/network-controller": ^18.0.0
-  checksum: 1d26deb26003346976e427d240a2fc0281cb03358859ea8dcddc65a58f6b1b9611d610470cd882a8a8caf82870c3425b18dc7393ef0a9955ba26321479d3feb2
-  languageName: node
-  linkType: hard
-
-"@metamask/gas-fee-controller@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@metamask/gas-fee-controller@npm:15.0.0"
+"@metamask/gas-fee-controller@npm:^15.0.0, @metamask/gas-fee-controller@npm:^15.1.0, @metamask/gas-fee-controller@npm:^15.1.1":
+  version: 15.1.1
+  resolution: "@metamask/gas-fee-controller@npm:15.1.1"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.2"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/ethjs-unit": "npm:^0.3.0"
     "@metamask/network-controller": "npm:^18.1.0"
-    "@metamask/polling-controller": "npm:^6.0.1"
-    "@metamask/utils": "npm:^8.3.0"
-    "@types/bn.js": "npm:^5.1.5"
-    "@types/uuid": "npm:^8.3.0"
-    bn.js: "npm:^5.2.1"
-    uuid: "npm:^8.3.2"
-  peerDependencies:
-    "@metamask/network-controller": ^18.0.0
-  checksum: f4ca2ca113d543d3f1282df8e171d06a8cd2ce99ad7df54d1796416f9c93dd62d998af09c124fbd5138b4592602c958d30c9fe03a8ed06ccaecd8745cd6a3913
-  languageName: node
-  linkType: hard
-
-"@metamask/gas-fee-controller@patch:@metamask/gas-fee-controller@npm%3A14.0.1#~/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch":
-  version: 14.0.1
-  resolution: "@metamask/gas-fee-controller@patch:@metamask/gas-fee-controller@npm%3A14.0.1#~/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch::version=14.0.1&hash=35f894"
-  dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/ethjs-unit": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^18.0.1"
-    "@metamask/polling-controller": "npm:^6.0.1"
+    "@metamask/polling-controller": "npm:^6.0.2"
     "@metamask/utils": "npm:^8.3.0"
     "@types/bn.js": "npm:^5.1.5"
     "@types/uuid": "npm:^8.3.0"
@@ -4733,7 +5202,7 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/network-controller": ^18.0.0
-  checksum: 93ff5edb72ce5c877c2bb35de09795ee824ea0709ca16569cdc98d957f286c56e61e9df643afd1bbde862d8ba8593eb9d56511b519201d2a975dade15a89a7a0
+  checksum: 6e0ddf10d4dde13e4da8bb17e7503a68f64369e51958059168f3400941b540dd02df417e60451a5bdb2be9d9fb1d4a11ae9685f811b0a4f1744ff23ce1c7b1ff
   languageName: node
   linkType: hard
 
@@ -4747,7 +5216,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^7.1.0, @metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.1, @metamask/json-rpc-engine@npm:^7.3.2, @metamask/json-rpc-engine@npm:^7.3.3":
+"@metamask/json-rpc-engine@npm:^7.1.0, @metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.1, @metamask/json-rpc-engine@npm:^7.3.2":
   version: 7.3.3
   resolution: "@metamask/json-rpc-engine@npm:7.3.3"
   dependencies:
@@ -4758,14 +5227,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "@metamask/json-rpc-engine@npm:8.0.1"
+"@metamask/json-rpc-engine@npm:^8.0.1, @metamask/json-rpc-engine@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@metamask/json-rpc-engine@npm:8.0.2"
   dependencies:
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/safe-event-emitter": "npm:^3.0.0"
     "@metamask/utils": "npm:^8.3.0"
-  checksum: 340ea9be62f65b69ae552571f0176af23097e874bae276aa2349f13086dbd018ce58a4b9bbd902eff81ab959b143fb2821930564a5739353312968210308cff7
+  checksum: f088f4b648b9b55875b56e8237853e7282f13302a9db6a1f9bba06314dfd6cd0a23b3d27f8fde05a157b97ebb03b67bc2699ba455c99553dfb2ecccd73ab3474
   languageName: node
   linkType: hard
 
@@ -4781,6 +5250,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/json-rpc-middleware-stream@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "@metamask/json-rpc-middleware-stream@npm:7.0.1"
+  dependencies:
+    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/safe-event-emitter": "npm:^3.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    readable-stream: "npm:^3.6.2"
+  checksum: 1df955cd6c39fb40388e1b656b401d94da1a6c9a780be0b17cff7d6ed8d63a6960e0693c18778e7acc79e3eec183df524ca711d98e17e0eefbaab5f4fe8a2fc4
+  languageName: node
+  linkType: hard
+
 "@metamask/key-tree@npm:^9.0.0":
   version: 9.0.0
   resolution: "@metamask/key-tree@npm:9.0.0"
@@ -4825,84 +5306,97 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:13.0.0":
-  version: 13.0.0
-  resolution: "@metamask/keyring-controller@npm:13.0.0"
+"@metamask/keyring-api@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "@metamask/keyring-api@npm:5.1.0"
   dependencies:
-    "@ethereumjs/util": "npm:^8.1.0"
-    "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/browser-passworder": "npm:^4.3.0"
-    "@metamask/eth-hd-keyring": "npm:^7.0.1"
-    "@metamask/eth-sig-util": "npm:^7.0.1"
-    "@metamask/eth-simple-keyring": "npm:^6.0.1"
-    "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/message-manager": "npm:^7.3.9"
+    "@metamask/snaps-sdk": "npm:^3.1.1"
     "@metamask/utils": "npm:^8.3.0"
-    async-mutex: "npm:^0.2.6"
-    ethereumjs-wallet: "npm:^1.0.1"
-    immer: "npm:^9.0.6"
-  checksum: 477b6d7b9104370f562a862a11406013a744109f8d49e34eacedef8c9a1101e9f02f101aca3ea3af2b32b77b17535443c02d771c384ef436718b5d2fc28cbbb7
+    "@types/uuid": "npm:^9.0.1"
+    superstruct: "npm:^1.0.3"
+    uuid: "npm:^9.0.0"
+  peerDependencies:
+    "@metamask/providers": ">=15 <17"
+  checksum: f1c7ddfabd1d2ef45f8b05d1a1b3c71ce3bb4d8111e53d00acc71f68a18473c0e5f90583644c72ee85e52021857d9f9de3fc9aaec9819209b849408539909eca
+  languageName: node
+  linkType: hard
+
+"@metamask/keyring-api@npm:^6.0.0":
+  version: 6.1.0
+  resolution: "@metamask/keyring-api@npm:6.1.0"
+  dependencies:
+    "@metamask/snaps-sdk": "npm:^4.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@types/uuid": "npm:^9.0.1"
+    bech32: "npm:^2.0.0"
+    superstruct: "npm:^1.0.3"
+    uuid: "npm:^9.0.0"
+  peerDependencies:
+    "@metamask/providers": ">=15 <17"
+  checksum: a1fc89907f462dcfdf6d9ed63953f73d98f5b1b3277754b77ca3a1787ba4b422e2b251949cdda26f2b7b0840ba482f1a1a42f0543bbc130e4077b949ba9db8ee
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^12.2.0":
-  version: 12.2.0
-  resolution: "@metamask/keyring-controller@npm:12.2.0"
+"@metamask/keyring-controller@npm:15.0.0, @metamask/keyring-controller@npm:^15.0.0":
+  version: 15.0.0
+  resolution: "@metamask/keyring-controller@npm:15.0.0"
   dependencies:
+    "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/eth-keyring-controller": "npm:^17.0.1"
-    "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/message-manager": "npm:^7.3.8"
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/browser-passworder": "npm:^4.3.0"
+    "@metamask/eth-hd-keyring": "npm:^7.0.1"
+    "@metamask/eth-sig-util": "npm:^7.0.1"
+    "@metamask/eth-simple-keyring": "npm:^6.0.1"
+    "@metamask/keyring-api": "npm:^5.1.0"
+    "@metamask/message-manager": "npm:^8.0.1"
     "@metamask/utils": "npm:^8.3.0"
     async-mutex: "npm:^0.2.6"
-    ethereumjs-util: "npm:^7.0.10"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  checksum: 8f671f10a1640df9d5bccee539fb522a070633dc402327d6d4a168c2730dbadc2abde395f87b2ca0df401b49d6e67060142870316c07761cbae7e15f9bc718b0
+  checksum: ae6c378ba68ee8e37fbf273a68f1ce0e5439e3f8c9b38a338fb9f9bd0fd6b12f9927e9c5f33a2ead87dd76e7665a71073187d744e7b810aecf24e2964b6af7a7
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^14.0.1":
-  version: 14.0.1
-  resolution: "@metamask/keyring-controller@npm:14.0.1"
+"@metamask/keyring-controller@npm:^16.0.0":
+  version: 16.0.0
+  resolution: "@metamask/keyring-controller@npm:16.0.0"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
-    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/base-controller": "npm:^5.0.2"
     "@metamask/browser-passworder": "npm:^4.3.0"
     "@metamask/eth-hd-keyring": "npm:^7.0.1"
     "@metamask/eth-sig-util": "npm:^7.0.1"
     "@metamask/eth-simple-keyring": "npm:^6.0.1"
-    "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/message-manager": "npm:^8.0.1"
+    "@metamask/keyring-api": "npm:^6.0.0"
+    "@metamask/message-manager": "npm:^8.0.2"
     "@metamask/utils": "npm:^8.3.0"
     async-mutex: "npm:^0.2.6"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  checksum: 060411df9e93f6a71deea47b2beb3c058530f1f99f525d7a5773a24cd76e22f21c1f8fc30810ff72f4092ec31410a337915a3dadd77d513caa5ad194a034b11f
+  checksum: 33c10f4c61acfa0f8de7a3d90c2dfc63be1d137866653254e3d5f68dbf4ee886415e2ab620009e5b82c2a112bfab6d09653f5ad16adeccecd87b89f1f1fa0b7c
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch":
-  version: 13.0.0
-  resolution: "@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch::version=13.0.0&hash=be29a2"
+"@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch":
+  version: 15.0.0
+  resolution: "@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch::version=15.0.0&hash=3f5b2f"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
-    "@metamask/base-controller": "npm:^4.1.1"
+    "@metamask/base-controller": "npm:^5.0.1"
     "@metamask/browser-passworder": "npm:^4.3.0"
     "@metamask/eth-hd-keyring": "npm:^7.0.1"
     "@metamask/eth-sig-util": "npm:^7.0.1"
     "@metamask/eth-simple-keyring": "npm:^6.0.1"
-    "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/message-manager": "npm:^7.3.9"
+    "@metamask/keyring-api": "npm:^5.1.0"
+    "@metamask/message-manager": "npm:^8.0.1"
     "@metamask/utils": "npm:^8.3.0"
     async-mutex: "npm:^0.2.6"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  checksum: 4995160ba60b792b8df4694cfde6762423e72d5ea9a637e39e40b602becd42c08b67dfa8b35b26690be3af5c93d6a4ef453e1ccdc7aff5100c0af5b71c226787
+  checksum: 76116ea6ba8b85e1d3117f4ceebc31d27e591402d77afa9451f661e629b7c3a697d8fdf3b2a7ec536abf3d30d98fe92d2404c5356a2e8656c9886c38589b04f3
   languageName: node
   linkType: hard
 
@@ -4927,7 +5421,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:^7.3.0, @metamask/message-manager@npm:^7.3.8, @metamask/message-manager@npm:^7.3.9":
+"@metamask/message-manager@npm:^7.3.0, @metamask/message-manager@npm:^7.3.8":
   version: 7.3.9
   resolution: "@metamask/message-manager@npm:7.3.9"
   dependencies:
@@ -4942,25 +5436,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "@metamask/message-manager@npm:8.0.1"
+"@metamask/message-manager@npm:^8.0.1, @metamask/message-manager@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@metamask/message-manager@npm:8.0.2"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/eth-sig-util": "npm:^7.0.1"
     "@metamask/utils": "npm:^8.3.0"
     "@types/uuid": "npm:^8.3.0"
     jsonschema: "npm:^1.2.4"
     uuid: "npm:^8.3.2"
-  checksum: 5c8c09e2cc96341b1e59bce821fe3f78bc40188c3895a9d1f27fa6c888e0e92eebade4d1abc4f9ca67733a8e2028d579649a98eb9cd026ae6cee184160c7c0cc
+  checksum: 4db369c80e8fc217706241d6f26d80435f6aaf50eba954abf8b0930b6bf8918d2d8e4c42386af7c60066bb6933b49adbb5a0df6b58f3cc5168de17ee3d3f0144
   languageName: node
   linkType: hard
 
-"@metamask/metamask-eth-abis@npm:3.0.0":
-  version: 3.0.0
-  resolution: "@metamask/metamask-eth-abis@npm:3.0.0"
-  checksum: 8c5e2c12d56843a4ecff24ae04b3062f2dcb0e89da5c684f438418c6a807f04ea2654ffabe05365c7603b01210bb26dbb418c9d9fdfc15d1becd69658d932d16
+"@metamask/message-signing-snap@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "@metamask/message-signing-snap@npm:0.3.3"
+  dependencies:
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/snaps-sdk": "npm:^3.1.1"
+    "@metamask/utils": "npm:^8.3.0"
+    "@noble/ciphers": "npm:^0.5.1"
+    "@noble/curves": "npm:^1.4.0"
+    "@noble/hashes": "npm:^1.4.0"
+    zod: "npm:^3.22.4"
+  checksum: 8290f9779e826965082ef1c18189e96502a51b9ed3ade486dab91a1bcf4af150ffb04207f620ba2b98b7b268efe107d4953ab64fed0932b66b87c72f98cc944e
   languageName: node
   linkType: hard
 
@@ -4982,29 +5484,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:18.0.1":
-  version: 18.0.1
-  resolution: "@metamask/network-controller@npm:18.0.1"
-  dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
-    "@metamask/eth-json-rpc-infura": "npm:^9.1.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^12.1.0"
-    "@metamask/eth-json-rpc-provider": "npm:^3.0.1"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/json-rpc-engine": "npm:^8.0.1"
-    "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/swappable-obj-proxy": "npm:^2.2.0"
-    "@metamask/utils": "npm:^8.3.0"
-    async-mutex: "npm:^0.2.6"
-    eth-block-tracker: "npm:^8.0.0"
-    immer: "npm:^9.0.6"
-    uuid: "npm:^8.3.2"
-  checksum: 70f06c231977e9215b1b81216a6cabcff5e928df9524f8889079bbc21657bb4c2167ebb20758d31c6cc859647d5d01d5a1022af2590b9d7fbe69ec5bfe71b099
-  languageName: node
-  linkType: hard
-
-"@metamask/network-controller@npm:^18.1.0":
+"@metamask/network-controller@npm:18.1.0":
   version: 18.1.0
   resolution: "@metamask/network-controller@npm:18.1.0"
   dependencies:
@@ -5026,12 +5506,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch":
-  version: 18.0.1
-  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch::version=18.0.1&hash=be87e4"
+"@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch":
+  version: 18.1.0
+  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch::version=18.1.0&hash=da1bba"
   dependencies:
     "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
+    "@metamask/controller-utils": "npm:^9.0.2"
     "@metamask/eth-json-rpc-infura": "npm:^9.1.0"
     "@metamask/eth-json-rpc-middleware": "npm:^12.1.0"
     "@metamask/eth-json-rpc-provider": "npm:^3.0.1"
@@ -5044,7 +5524,7 @@ __metadata:
     eth-block-tracker: "npm:^8.0.0"
     immer: "npm:^9.0.6"
     uuid: "npm:^8.3.2"
-  checksum: 348114ad32db34d4a197422f57f0f394442d1b7a2c79249768b6b061ce64ea0cf6a39d23b743075ef6b8d5778243545061f11aa74d839ec58c14f0386ed96598
+  checksum: 184466aab692b52285124784e8d3c377deda590363644e3127785a645f538251ed8358f9037631d5a26f39b9400fa728bb74009b00bfd8b23a1e6c22cf54e0ad
   languageName: node
   linkType: hard
 
@@ -5111,16 +5591,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/obs-store@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "@metamask/obs-store@npm:9.0.0"
-  dependencies:
-    "@metamask/safe-event-emitter": "npm:^3.0.0"
-    readable-stream: "npm:^3.6.2"
-  checksum: 1c202a5bbdc79a6b8b3fba946c09dc5521e87260956d30db6543e7bf3d95bd44ebd958f509e3e7332041845176487fe78d3b40bdedbc213061ba849fd978e468
-  languageName: node
-  linkType: hard
-
 "@metamask/permission-controller@npm:^7.0.0, @metamask/permission-controller@npm:^7.1.0":
   version: 7.1.0
   resolution: "@metamask/permission-controller@npm:7.1.0"
@@ -5140,26 +5610,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/permission-controller@npm:^8.0.0, @metamask/permission-controller@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "@metamask/permission-controller@npm:8.0.1"
-  dependencies:
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/controller-utils": "npm:^8.0.3"
-    "@metamask/json-rpc-engine": "npm:^7.3.2"
-    "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/utils": "npm:^8.3.0"
-    "@types/deep-freeze-strict": "npm:^1.1.0"
-    deep-freeze-strict: "npm:^1.1.1"
-    immer: "npm:^9.0.6"
-    nanoid: "npm:^3.1.31"
-  peerDependencies:
-    "@metamask/approval-controller": ^5.1.2
-  checksum: ab10e4e1f9b3424ed4453289f772c5a7c62178b0459ffbea23282b2cd6d1e75c2deab01e647e6558369fa45cba3b6555c1b72f2354d57389e9480979182f769d
-  languageName: node
-  linkType: hard
-
-"@metamask/permission-controller@npm:^9.0.2":
+"@metamask/permission-controller@npm:^9.0.1, @metamask/permission-controller@npm:^9.0.2":
   version: 9.0.2
   resolution: "@metamask/permission-controller@npm:9.0.2"
   dependencies:
@@ -5189,7 +5640,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/phishing-controller@npm:^8.0.0, @metamask/phishing-controller@npm:^8.0.1, @metamask/phishing-controller@npm:^8.0.2":
+"@metamask/phishing-controller@npm:^8.0.1":
   version: 8.0.2
   resolution: "@metamask/phishing-controller@npm:8.0.2"
   dependencies:
@@ -5202,6 +5653,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/phishing-controller@npm:^9.0.1, @metamask/phishing-controller@npm:^9.0.2":
+  version: 9.0.2
+  resolution: "@metamask/phishing-controller@npm:9.0.2"
+  dependencies:
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
+    "@types/punycode": "npm:^2.1.0"
+    eth-phishing-detect: "npm:^1.2.0"
+    punycode: "npm:^2.1.1"
+  checksum: 2a1fa922502a42e831567ac3965489e1b61b75fc5bcd1619b417ee3747b98ab3a1381a17b68b70a121154667858ca666c91bf1c1743892640b6f1f3d221e2bde
+  languageName: node
+  linkType: hard
+
 "@metamask/phishing-warning@npm:^3.0.3":
   version: 3.0.3
   resolution: "@metamask/phishing-warning@npm:3.0.3"
@@ -5218,37 +5682,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/polling-controller@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@metamask/polling-controller@npm:5.0.1"
-  dependencies:
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/controller-utils": "npm:^8.0.4"
-    "@metamask/network-controller": "npm:^17.2.1"
-    "@metamask/utils": "npm:^8.3.0"
-    "@types/uuid": "npm:^8.3.0"
-    fast-json-stable-stringify: "npm:^2.1.0"
-    uuid: "npm:^8.3.2"
-  peerDependencies:
-    "@metamask/network-controller": ^17.2.0
-  checksum: 3b2a0bcc2aa83758f973364746aaf291fef3db1b1ef188813e522b7dd41967a57888d5d8150fe0fb0226d5d85631b5df4d72f4c879f9132948800753a91b752c
-  languageName: node
-  linkType: hard
-
-"@metamask/polling-controller@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "@metamask/polling-controller@npm:6.0.1"
+"@metamask/polling-controller@npm:^6.0.1, @metamask/polling-controller@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "@metamask/polling-controller@npm:6.0.2"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
-    "@metamask/network-controller": "npm:^18.0.1"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/network-controller": "npm:^18.1.0"
     "@metamask/utils": "npm:^8.3.0"
     "@types/uuid": "npm:^8.3.0"
     fast-json-stable-stringify: "npm:^2.1.0"
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/network-controller": ^18.0.0
-  checksum: 178f6b978043f824bf841ec03321406e0d095cdb7880cb9fd4f4cbe12e7bef2d13bfdfce31dc58ae9f89694824f994a3385b2d033e14575780bef47e2d12e8e9
+  checksum: 86fecbb621621546d2c97a60da85831eba5b57bbd9a4d361865ebe2ff99edff9393e90ffd027d3506d2d8213bc3c4ea7614a4f5b506173d6b1954ff6b43ccd35
   languageName: node
   linkType: hard
 
@@ -5272,9 +5719,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ppom-validator@npm:^0.29.0":
-  version: 0.29.0
-  resolution: "@metamask/ppom-validator@npm:0.29.0"
+"@metamask/ppom-validator@npm:^0.30.0":
+  version: 0.30.0
+  resolution: "@metamask/ppom-validator@npm:0.30.0"
   dependencies:
     "@metamask/base-controller": "npm:^3.0.0"
     "@metamask/controller-utils": "npm:^8.0.1"
@@ -5285,19 +5732,19 @@ __metadata:
     elliptic: "npm:^6.5.4"
     eslint-plugin-n: "npm:^16.6.2"
     json-rpc-random-id: "npm:^1.0.1"
-  checksum: 744319c0aa35e6bed54d600980b95713b8390f5b9b07c71192bfa5c7a41a13280c22e93459cfb84cc361c4d49911b32ede5c0a96d3229ce664a9c06ad144ce19
+  checksum: 6085ede7f68fbda16421d2308b668a26ed6e3c465d210ac7122f4c6a14348fc0990740c0d571ed4d62ea463b40e5dd8cf14c022127d956df275ef88ac72d6592
   languageName: node
   linkType: hard
 
-"@metamask/preferences-controller@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@metamask/preferences-controller@npm:8.0.0"
+"@metamask/preferences-controller@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "@metamask/preferences-controller@npm:11.0.0"
   dependencies:
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/controller-utils": "npm:^8.0.4"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
   peerDependencies:
-    "@metamask/keyring-controller": ^13.0.0
-  checksum: 40b5efc1c3ad2b5d6662a1989b9bf60c62bb9a6a681bf7dd9b3033f4a55b7cd03ce709110691843d70c6d03c220ab459562209c304c45b11ee581359e4cf1281
+    "@metamask/keyring-controller": ^16.0.0
+  checksum: 76c0df045e1905341ffcada6489ac27492cae8fcc17f153c29c228fc2e55d8d33043ef42b592b636b8bec2c6db1d56fa3a0cda9f54e2d9fb3236963a46a96c65
   languageName: node
   linkType: hard
 
@@ -5321,9 +5768,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/providers@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@metamask/providers@npm:15.0.0"
+"@metamask/providers@npm:^16.0.0":
+  version: 16.0.0
+  resolution: "@metamask/providers@npm:16.0.0"
   dependencies:
     "@metamask/json-rpc-engine": "npm:^7.3.2"
     "@metamask/json-rpc-middleware-stream": "npm:^6.0.2"
@@ -5337,24 +5784,24 @@ __metadata:
     is-stream: "npm:^2.0.0"
     readable-stream: "npm:^3.6.2"
     webextension-polyfill: "npm:^0.10.0"
-  checksum: d022fe6d2db577fcd299477f19dd1a0ca88baeae542d8a80330694d004bffc289eecf7008c619408c819de8f43eb9fc989b27e266a5961ffd43cb9c2ec749dd5
+  checksum: 87dc29c91634bbe29a445f20e26edeb2f5e534af45f4a870608f73fcfd7aa28afe83974bbea632b61862ff8ca51f5322004ed79fc6d954b253155dc5f51488f5
   languageName: node
   linkType: hard
 
-"@metamask/queued-request-controller@npm:^0.6.0":
-  version: 0.6.1
-  resolution: "@metamask/queued-request-controller@npm:0.6.1"
+"@metamask/queued-request-controller@npm:^0.10.0":
+  version: 0.10.0
+  resolution: "@metamask/queued-request-controller@npm:0.10.0"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
-    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/json-rpc-engine": "npm:^8.0.2"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/swappable-obj-proxy": "npm:^2.2.0"
     "@metamask/utils": "npm:^8.3.0"
   peerDependencies:
     "@metamask/network-controller": ^18.0.0
-    "@metamask/selected-network-controller": ^10.0.0
-  checksum: a4cd0c5f6a1c9212b4ac1e54f2c7ed3a2a91d009d8e535d03c886849353043e5a260e95b06a9fc1e982cf652cc61905eacec7e19eec5195a9112b0c57fd5e7e8
+    "@metamask/selected-network-controller": ^13.0.0
+  checksum: b6caba5889b1e6219d33a5e80c6a3baf77c64b52cfdde8123f4e44d21ef501b78c49e111b050bb4aacd0bf12bd3593f88058f2a230ff5693d7b9d8ff1521e5bc
   languageName: node
   linkType: hard
 
@@ -5403,20 +5850,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/selected-network-controller@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "@metamask/selected-network-controller@npm:9.0.0"
+"@metamask/selected-network-controller@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "@metamask/selected-network-controller@npm:13.0.0"
   dependencies:
-    "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/json-rpc-engine": "npm:^7.3.2"
-    "@metamask/network-controller": "npm:^17.2.0"
-    "@metamask/permission-controller": "npm:^8.0.1"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/json-rpc-engine": "npm:^8.0.2"
+    "@metamask/network-controller": "npm:^18.1.0"
+    "@metamask/permission-controller": "npm:^9.0.2"
     "@metamask/swappable-obj-proxy": "npm:^2.2.0"
     "@metamask/utils": "npm:^8.3.0"
   peerDependencies:
-    "@metamask/network-controller": ^17.2.0
-    "@metamask/permission-controller": ^8.0.1
-  checksum: 5b784e1bb3623226408cc20c4263766a0fb495dacb052de38bb8a1bfab6786e8ce36938b3faa4a7e53d9f284046d5bff189e3104217cb7ccc8587d51a5f8e293
+    "@metamask/network-controller": ^18.0.0
+    "@metamask/permission-controller": ^9.0.0
+  checksum: bebb6798ea9b7f12535f1997b69ef4aa7669c245566dfbb8c6729d9e497c8a0dc52ddd42db09defc6acba3ea82d2eaddead149f05ce4730bc4096eae0cb71750
   languageName: node
   linkType: hard
 
@@ -5449,20 +5896,62 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/smart-transactions-controller@npm:^6.2.2":
-  version: 6.2.2
-  resolution: "@metamask/smart-transactions-controller@npm:6.2.2"
+"@metamask/smart-transactions-controller@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@metamask/smart-transactions-controller@npm:10.0.1"
   dependencies:
-    "@ethersproject/bignumber": "npm:^5.7.0"
+    "@babel/runtime": "npm:^7.24.1"
+    "@ethereumjs/tx": "npm:^5.2.1"
+    "@ethereumjs/util": "npm:^9.0.2"
     "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/base-controller": "npm:^3.2.1"
-    "@metamask/controller-utils": "npm:^5.0.0"
-    "@metamask/network-controller": "npm:^15.0.0"
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/network-controller": "npm:^18.1.0"
+    "@metamask/polling-controller": "npm:^6.0.1"
+    "@metamask/transaction-controller": "npm:^28.1.0"
     bignumber.js: "npm:^9.0.1"
+    events: "npm:^3.3.0"
     fast-json-patch: "npm:^3.1.0"
     lodash: "npm:^4.17.21"
-  checksum: 48886eee59ed2db8eb9a10c23b302a00024eabc3080c58f63f498caa497a6b8d32caf4c85cf994b4fff977f9f0cc8b808efda91a08091b7fcf903eb5acc7ae0e
+  checksum: ff8c14257ed733161650f1527c136eac0b31bafd1c027af839a492bb8995c236d517a140a6c5201ed1b34726ef9c2674c1ab4830e5dc54546586601532546715
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-controllers@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/snaps-controllers@npm:8.0.0"
+  dependencies:
+    "@metamask/approval-controller": "npm:^6.0.1"
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/json-rpc-middleware-stream": "npm:^7.0.1"
+    "@metamask/object-multiplex": "npm:^2.0.0"
+    "@metamask/permission-controller": "npm:^9.0.2"
+    "@metamask/phishing-controller": "npm:^9.0.1"
+    "@metamask/post-message-stream": "npm:^8.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-rpc-methods": "npm:^8.0.0"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
+    "@metamask/snaps-utils": "npm:^7.2.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@xstate/fsm": "npm:^2.0.0"
+    browserify-zlib: "npm:^0.2.0"
+    concat-stream: "npm:^2.0.0"
+    fast-deep-equal: "npm:^3.1.3"
+    get-npm-tarball-url: "npm:^2.0.3"
+    immer: "npm:^9.0.6"
+    nanoid: "npm:^3.1.31"
+    readable-stream: "npm:^3.6.2"
+    readable-web-to-node-stream: "npm:^3.0.2"
+    tar-stream: "npm:^3.1.7"
+  peerDependencies:
+    "@metamask/snaps-execution-environments": ^6.0.2
+  peerDependenciesMeta:
+    "@metamask/snaps-execution-environments":
+      optional: true
+  checksum: 05300eae1ac3be399b2febdaeb1bf0a1251f92130dc3d849bb7e582f1c3ee61c57c5203db2429e9d3c3f9fb4646d74616850ebecb6c328fd60abbb698e065d10
   languageName: node
   linkType: hard
 
@@ -5538,62 +6027,99 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "@metamask/snaps-controllers@npm:6.0.3"
+"@metamask/snaps-controllers@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "@metamask/snaps-controllers@npm:7.0.1"
   dependencies:
-    "@metamask/approval-controller": "npm:^5.1.3"
-    "@metamask/base-controller": "npm:^4.1.0"
-    "@metamask/json-rpc-engine": "npm:^7.3.3"
+    "@metamask/approval-controller": "npm:^6.0.1"
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/json-rpc-middleware-stream": "npm:^7.0.1"
     "@metamask/object-multiplex": "npm:^2.0.0"
-    "@metamask/permission-controller": "npm:^8.0.1"
-    "@metamask/phishing-controller": "npm:^8.0.2"
+    "@metamask/permission-controller": "npm:^9.0.2"
+    "@metamask/phishing-controller": "npm:^9.0.1"
     "@metamask/post-message-stream": "npm:^8.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/snaps-registry": "npm:^3.0.1"
-    "@metamask/snaps-rpc-methods": "npm:^7.0.1"
-    "@metamask/snaps-sdk": "npm:^3.1.1"
-    "@metamask/snaps-utils": "npm:^7.0.3"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-rpc-methods": "npm:^8.0.0"
+    "@metamask/snaps-sdk": "npm:^4.0.0"
+    "@metamask/snaps-utils": "npm:^7.1.0"
     "@metamask/utils": "npm:^8.3.0"
     "@xstate/fsm": "npm:^2.0.0"
     browserify-zlib: "npm:^0.2.0"
     concat-stream: "npm:^2.0.0"
     get-npm-tarball-url: "npm:^2.0.3"
     immer: "npm:^9.0.6"
-    json-rpc-middleware-stream: "npm:^5.0.0"
     nanoid: "npm:^3.1.31"
     readable-stream: "npm:^3.6.2"
     readable-web-to-node-stream: "npm:^3.0.2"
     tar-stream: "npm:^3.1.7"
   peerDependencies:
-    "@metamask/snaps-execution-environments": ^5.0.3
+    "@metamask/snaps-execution-environments": ^6.0.0
   peerDependenciesMeta:
     "@metamask/snaps-execution-environments":
       optional: true
-  checksum: 620007bad7243840520fdbbcbc3395918513a8d6674e2bb40a6243f422f716eedbda4a5cea4e83ed125255cb6937673b8dc9114946eaa8094fd7825465b6f77d
+  checksum: 4c8208aee45635f206e0663caaaa32c64a48aa78a6fcc6b3507d2214c1740db186ae750d8e9eb972283fd89d3a8f4f054b4ddf77443519fdd1bd35e97f6141d2
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "@metamask/snaps-execution-environments@npm:5.0.3"
+"@metamask/snaps-controllers@patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch":
+  version: 8.0.0
+  resolution: "@metamask/snaps-controllers@patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch::version=8.0.0&hash=486f94"
   dependencies:
-    "@metamask/json-rpc-engine": "npm:^7.3.3"
+    "@metamask/approval-controller": "npm:^6.0.1"
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/json-rpc-middleware-stream": "npm:^7.0.1"
     "@metamask/object-multiplex": "npm:^2.0.0"
+    "@metamask/permission-controller": "npm:^9.0.2"
+    "@metamask/phishing-controller": "npm:^9.0.1"
     "@metamask/post-message-stream": "npm:^8.0.0"
-    "@metamask/providers": "npm:^15.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/snaps-sdk": "npm:^3.1.1"
-    "@metamask/snaps-utils": "npm:^7.0.3"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-rpc-methods": "npm:^8.0.0"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
+    "@metamask/snaps-utils": "npm:^7.2.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@xstate/fsm": "npm:^2.0.0"
+    browserify-zlib: "npm:^0.2.0"
+    concat-stream: "npm:^2.0.0"
+    fast-deep-equal: "npm:^3.1.3"
+    get-npm-tarball-url: "npm:^2.0.3"
+    immer: "npm:^9.0.6"
+    nanoid: "npm:^3.1.31"
+    readable-stream: "npm:^3.6.2"
+    readable-web-to-node-stream: "npm:^3.0.2"
+    tar-stream: "npm:^3.1.7"
+  peerDependencies:
+    "@metamask/snaps-execution-environments": ^6.0.2
+  peerDependenciesMeta:
+    "@metamask/snaps-execution-environments":
+      optional: true
+  checksum: f818d2c2d8c1d31bbba6c0972f16e6b5416d242442f5713dc347b7d0202a16213170e60360c85e005d3c9f913d2bed93ea3c2d2fb2183eafa694665b45b737e3
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-execution-environments@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "@metamask/snaps-execution-environments@npm:6.0.2"
+  dependencies:
+    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/object-multiplex": "npm:^2.0.0"
+    "@metamask/post-message-stream": "npm:^8.0.0"
+    "@metamask/providers": "npm:^16.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
+    "@metamask/snaps-utils": "npm:^7.2.0"
     "@metamask/utils": "npm:^8.3.0"
     nanoid: "npm:^3.1.31"
     readable-stream: "npm:^3.6.2"
     superstruct: "npm:^1.0.3"
-  checksum: 28e92324b9ec4ab91ffc711ab922f0b625975526475c4dbda5b3369c9904c6697a25e9241a63c2f03f1b48a5d61ae2dc5921715a52c6f70d40f5a64565a0930b
+  checksum: c8911e0f12315067cddcf33cef610677f0a7727f0fcefca258790af8bf85bf2de3bc4759076ad873c7f8a91953263f2e29c5943ce5725528e4eb3cd492c6d232
   languageName: node
   linkType: hard
 
-"@metamask/snaps-registry@npm:^3.0.0, @metamask/snaps-registry@npm:^3.0.1, @metamask/snaps-registry@npm:^3.1.0":
+"@metamask/snaps-registry@npm:^3.0.0, @metamask/snaps-registry@npm:^3.1.0":
   version: 3.1.0
   resolution: "@metamask/snaps-registry@npm:3.1.0"
   dependencies:
@@ -5637,33 +6163,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "@metamask/snaps-rpc-methods@npm:7.0.1"
+"@metamask/snaps-rpc-methods@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/snaps-rpc-methods@npm:8.0.0"
   dependencies:
     "@metamask/key-tree": "npm:^9.0.0"
-    "@metamask/permission-controller": "npm:^8.0.1"
+    "@metamask/permission-controller": "npm:^9.0.2"
     "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/snaps-sdk": "npm:^3.0.1"
-    "@metamask/snaps-utils": "npm:^7.0.1"
+    "@metamask/snaps-sdk": "npm:^4.0.0"
+    "@metamask/snaps-utils": "npm:^7.1.0"
     "@metamask/utils": "npm:^8.3.0"
     "@noble/hashes": "npm:^1.3.1"
     superstruct: "npm:^1.0.3"
-  checksum: c85359e96fd8fc69bb05d538e19434c23be2ec90ea8080ade5eac173e11997e7c78b44e0c1231eb8bb15fbbc75c55763471c139b99ba5ae999b6daf7113e8250
+  checksum: 71ad1c7a604252ac6217008a16a010c14ec7184d646c20efd2f7200e6f409b068d747e378417bd4fd76e4fd524e2a15f1cf4bc21f8249a916d6fd75e39c10371
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@metamask/snaps-sdk@npm:3.1.1"
+"@metamask/snaps-sdk@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@metamask/snaps-sdk@npm:4.0.1"
   dependencies:
     "@metamask/key-tree": "npm:^9.0.0"
-    "@metamask/providers": "npm:^15.0.0"
+    "@metamask/providers": "npm:^16.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/utils": "npm:^8.3.0"
     fast-xml-parser: "npm:^4.3.4"
     superstruct: "npm:^1.0.3"
-  checksum: c9fe4baf211f60b75800f28df27317a34c0dbea1e1c94e6a26b475e4854b08e058d8f66ebcdd1dd34620e4ba19a735b32c37eecd9937a3c73a5bdcdb71d8af67
+  checksum: e6a80b3017c738d2399fe566bb77a87eee94a28b0071fbf172a917cfaf1355a096971609fafc957c3729b65c96f2e385f5f06d88d76c2a02eb2354a0868cb9f7
   languageName: node
   linkType: hard
 
@@ -5697,9 +6223,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^7.0.1, @metamask/snaps-utils@npm:^7.0.3, @metamask/snaps-utils@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "@metamask/snaps-utils@npm:7.1.0"
+"@metamask/snaps-utils@npm:^7.0.3, @metamask/snaps-utils@npm:^7.1.0, @metamask/snaps-utils@npm:^7.1.1, @metamask/snaps-utils@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "@metamask/snaps-utils@npm:7.2.0"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
@@ -5709,7 +6235,7 @@ __metadata:
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/slip44": "npm:^3.1.0"
     "@metamask/snaps-registry": "npm:^3.1.0"
-    "@metamask/snaps-sdk": "npm:^4.0.0"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
     "@metamask/utils": "npm:^8.3.0"
     "@noble/hashes": "npm:^1.3.1"
     "@scure/base": "npm:^1.1.1"
@@ -5723,7 +6249,7 @@ __metadata:
     ses: "npm:^1.1.0"
     superstruct: "npm:^1.0.3"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 94e8161b0ebb2d2722689c30eabb3c1b1d6d04bbbcb4c256cbd2649a1b1e1a057af35acefeb9d53e44c4951388a0a95fb9d979ba855379e91d2e8608019bbd94
+  checksum: ca2b1e236a708fdfbc46ba2e8b159e9bdd25fc3a21155d00f964da93ecbd77d6b21ad4279dc3248f3033e4d25d013f5c452f991e59426d58825579a6e33c9e5a
   languageName: node
   linkType: hard
 
@@ -5764,21 +6290,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^25.1.0":
-  version: 25.3.0
-  resolution: "@metamask/transaction-controller@npm:25.3.0"
+"@metamask/transaction-controller@npm:^28.1.0":
+  version: 28.1.1
+  resolution: "@metamask/transaction-controller@npm:28.1.1"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
     "@ethereumjs/util": "npm:^8.1.0"
     "@ethersproject/abi": "npm:^5.7.0"
+    "@ethersproject/contracts": "npm:^5.7.0"
+    "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/approval-controller": "npm:^6.0.1"
     "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/gas-fee-controller": "npm:^14.0.1"
+    "@metamask/gas-fee-controller": "npm:^15.1.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/network-controller": "npm:^18.0.1"
+    "@metamask/network-controller": "npm:^18.1.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/utils": "npm:^8.3.0"
     async-mutex: "npm:^0.2.6"
@@ -5791,15 +6319,15 @@ __metadata:
   peerDependencies:
     "@babel/runtime": ^7.23.9
     "@metamask/approval-controller": ^6.0.0
-    "@metamask/gas-fee-controller": ^14.0.0
+    "@metamask/gas-fee-controller": ^15.0.0
     "@metamask/network-controller": ^18.0.0
-  checksum: c429c6c042209688b8bdb5f7cd35f48f88ef52873feb862784aeeaac576783831f9455e005c40d7b641ccb4a41122e1c74d9aa9eaf6646341eee03431752de02
+  checksum: 01e6f0e1431e56cc0ef986cbfa99cf37e0a44aade14419c69d815be77847bb33b43049b90c6e6961bb5070ecfe1420c893db8a68c0fd6977d5ec28d9853d6554
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^27.0.1":
-  version: 27.0.1
-  resolution: "@metamask/transaction-controller@npm:27.0.1"
+"@metamask/transaction-controller@npm:^29.0.0":
+  version: 29.0.0
+  resolution: "@metamask/transaction-controller@npm:29.0.0"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -5807,11 +6335,11 @@ __metadata:
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/approval-controller": "npm:^6.0.1"
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.2"
+    "@metamask/approval-controller": "npm:^6.0.2"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/gas-fee-controller": "npm:^15.0.0"
+    "@metamask/gas-fee-controller": "npm:^15.1.1"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/network-controller": "npm:^18.1.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
@@ -5828,24 +6356,24 @@ __metadata:
     "@metamask/approval-controller": ^6.0.0
     "@metamask/gas-fee-controller": ^15.0.0
     "@metamask/network-controller": ^18.0.0
-  checksum: aeb682e943120de802f1125a55b4fbd50924cf21d939d264b29562ad302aa59c242eb2ace4a473f0383a3f88bb9b26b3460075797300bbb824ceed8057c170f8
+  checksum: c40cc6787ccad5894af470870151f00394decab463c23ef5032bbe329bb2d720edeaaf61716f9774d61b25f499ed65a657d15b3abdfdf56a41305c5174be8862
   languageName: node
   linkType: hard
 
-"@metamask/user-operation-controller@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "@metamask/user-operation-controller@npm:6.0.1"
+"@metamask/user-operation-controller@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "@metamask/user-operation-controller@npm:8.0.1"
   dependencies:
     "@metamask/approval-controller": "npm:^6.0.1"
     "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/gas-fee-controller": "npm:^14.0.1"
-    "@metamask/keyring-controller": "npm:^14.0.1"
-    "@metamask/network-controller": "npm:^18.0.1"
+    "@metamask/gas-fee-controller": "npm:^15.0.0"
+    "@metamask/keyring-controller": "npm:^15.0.0"
+    "@metamask/network-controller": "npm:^18.1.0"
     "@metamask/polling-controller": "npm:^6.0.1"
     "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/transaction-controller": "npm:^25.1.0"
+    "@metamask/transaction-controller": "npm:^28.1.0"
     "@metamask/utils": "npm:^8.3.0"
     bn.js: "npm:^5.2.1"
     immer: "npm:^9.0.6"
@@ -5854,11 +6382,11 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/approval-controller": ^6.0.0
-    "@metamask/gas-fee-controller": ^14.0.0
-    "@metamask/keyring-controller": ^14.0.0
+    "@metamask/gas-fee-controller": ^15.0.0
+    "@metamask/keyring-controller": ^15.0.0
     "@metamask/network-controller": ^18.0.0
-    "@metamask/transaction-controller": ^25.0.0
-  checksum: 3cf59251bf88e15fb6ab8115cddff8628cb0bf425031e10821a5e09a94ac04d44ebc13743caeb6eac8e6e9b1cfb701c62a69818b55f66aa209d9f4249a89d974
+    "@metamask/transaction-controller": ^28.0.0
+  checksum: b489706430c526a795d408e0d719f2a0d7f79586ea5f556f1a737c61eb61319022e168b65527e5be061bb7bb9a3fa56a58ff50d78fce8eab89ba8663c6877ab0
   languageName: node
   linkType: hard
 
@@ -5889,9 +6417,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/utils@npm:^8.0.0, @metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.2.0, @metamask/utils@npm:^8.2.1, @metamask/utils@npm:^8.3.0":
-  version: 8.3.0
-  resolution: "@metamask/utils@npm:8.3.0"
+"@metamask/utils@npm:^8.0.0, @metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.2.0, @metamask/utils@npm:^8.2.1, @metamask/utils@npm:^8.3.0, @metamask/utils@npm:^8.4.0":
+  version: 8.4.0
+  resolution: "@metamask/utils@npm:8.4.0"
   dependencies:
     "@ethereumjs/tx": "npm:^4.2.0"
     "@noble/hashes": "npm:^1.3.1"
@@ -5901,7 +6429,8 @@ __metadata:
     pony-cause: "npm:^2.1.10"
     semver: "npm:^7.5.4"
     superstruct: "npm:^1.0.3"
-  checksum: 728a4f6b3ab14223a487e8974a21b1917e470ff2c131afc0b8a6a6823839d6cf7454243ddb0ff695ceebede62feaf628f4d32b4b529bb5c044c6c95576a142ef
+    uuid: "npm:^9.0.1"
+  checksum: 5ce14d4e1630bf9269ab3b5cf3e05f393776b806c5be10a503128a3bc1d3aee891465d1f3937f537fdecec355a202a99ab70ae74f9bd37d51d3730c98c8f3dfc
   languageName: node
   linkType: hard
 
@@ -5954,7 +6483,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/curves@npm:1.3.0, @noble/curves@npm:^1.2.0, @noble/curves@npm:~1.3.0":
+"@noble/ciphers@npm:^0.5.1, @noble/ciphers@npm:^0.5.2":
+  version: 0.5.2
+  resolution: "@noble/ciphers@npm:0.5.2"
+  checksum: 47a5958954249d5edb49aff48ae6fbfff4d4e5a6bb221c010ebc8e7470c410e9208a2f3f6bf8b7eca83057277478f4ccbdbdcf1bfd324608b334b9f9d28a9fbb
+  languageName: node
+  linkType: hard
+
+"@noble/curves@npm:1.3.0, @noble/curves@npm:~1.3.0":
   version: 1.3.0
   resolution: "@noble/curves@npm:1.3.0"
   dependencies:
@@ -5963,6 +6499,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/curves@npm:^1.2.0, @noble/curves@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@noble/curves@npm:1.4.0"
+  dependencies:
+    "@noble/hashes": "npm:1.4.0"
+  checksum: b21b30a36ff02bfcc0f5e6163d245cdbaf7f640511fff97ccf83fc207ee79cfd91584b4d97977374de04cb118a55eb63a7964c82596a64162bbc42bc685ae6d9
+  languageName: node
+  linkType: hard
+
 "@noble/ed25519@npm:^1.6.0":
   version: 1.6.0
   resolution: "@noble/ed25519@npm:1.6.0"
@@ -5977,13 +6522,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:1.3.3, @noble/hashes@npm:^1.0.0, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:~1.3.2":
+"@noble/hashes@npm:1.3.3, @noble/hashes@npm:~1.3.2":
   version: 1.3.3
   resolution: "@noble/hashes@npm:1.3.3"
   checksum: 1025ddde4d24630e95c0818e63d2d54ee131b980fe113312d17ed7468bc18f54486ac86c907685759f8a7e13c2f9b9e83ec7b67d1cc20836f36b5e4a65bb102d
   languageName: node
   linkType: hard
 
+"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.0.0, @noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@noble/hashes@npm:1.4.0"
+  checksum: e156e65794c473794c52fa9d06baf1eb20903d0d96719530f523cc4450f6c721a957c544796e6efd0197b2296e7cd70efeb312f861465e17940a3e3c7e0febc6
+  languageName: node
+  linkType: hard
+
 "@noble/hashes@npm:~1.1.1":
   version: 1.1.3
   resolution: "@noble/hashes@npm:1.1.3"
@@ -7244,12 +7796,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@spruceid/siwe-parser@npm:1.1.3":
-  version: 1.1.3
-  resolution: "@spruceid/siwe-parser@npm:1.1.3"
+"@spruceid/siwe-parser@npm:2.1.0":
+  version: 2.1.0
+  resolution: "@spruceid/siwe-parser@npm:2.1.0"
   dependencies:
+    "@noble/hashes": "npm:^1.1.2"
     apg-js: "npm:^4.1.1"
-  checksum: c953fa1e79c633a92f030b68a44225b28c71396553dc5eb8d4d5b263e8b2e5b988131720170df2eaf202ee5251d4369ccff99c130b691a1accca2a1ff93b1111
+    uri-js: "npm:^4.4.1"
+    valid-url: "npm:^1.0.9"
+  checksum: 12198f613f15000b5ec2e2f59c4c3c34918c88d48e0c2e2cfdb34ce926b89a13b6f18e7612777ffb8fa25ca2c226577e47c72592e76823b03770b67c54f78d38
+  languageName: node
+  linkType: hard
+
+"@spruceid/siwe-parser@patch:@spruceid/siwe-parser@npm%3A2.1.0#~/.yarn/patches/@spruceid-siwe-parser-npm-2.1.0-060b7ede7a.patch":
+  version: 2.1.0
+  resolution: "@spruceid/siwe-parser@patch:@spruceid/siwe-parser@npm%3A2.1.0#~/.yarn/patches/@spruceid-siwe-parser-npm-2.1.0-060b7ede7a.patch::version=2.1.0&hash=22ff08"
+  dependencies:
+    "@noble/hashes": "npm:^1.1.2"
+    apg-js: "npm:^4.1.1"
+    uri-js: "npm:^4.4.1"
+    valid-url: "npm:^1.0.9"
+  checksum: 6a6f7fbf7a43a63a3e9cf7fadd4ef2bc700d3933ed65db1b5d57262cc1b502bb2d00e741b3b315c705897c34dcf6b9031c4963e6e72e8608d593f1bfdaf32169
   languageName: node
   linkType: hard
 
@@ -9542,10 +10109,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "@types/estree@npm:1.0.1"
-  checksum: f252569c002506c61ad913e778aa69415908078c46c78c901ccad77bc66cd34f1e1b9babefb8ff0d27c07a15fb0824755edd7bb3fa7ea828f32ae0fe5faa9962
+"@types/estree@npm:*, @types/estree@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: 7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408
   languageName: node
   linkType: hard
 
@@ -9930,7 +10497,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^20, @types/node@npm:^20.11.17":
+"@types/node@npm:*, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0, @types/node@npm:^20, @types/node@npm:^20.11.17":
   version: 20.12.7
   resolution: "@types/node@npm:20.12.7"
   dependencies:
@@ -10708,13 +11275,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/ast@npm:1.11.6"
+"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/ast@npm:1.12.1"
   dependencies:
     "@webassemblyjs/helper-numbers": "npm:1.11.6"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-  checksum: 4c1303971ccd5188731c9b01073d9738333f37b946a48c4e049f7b788706cdc66f473cd6f3e791423a94c52a3b2230d070007930d29bccbce238b23835839f3c
+  checksum: a775b0559437ae122d14fec0cfe59fdcaf5ca2d8ff48254014fd05d6797e20401e0f1518e628f9b06819aa085834a2534234977f9608b3f2e51f94b6e8b0bc43
   languageName: node
   linkType: hard
 
@@ -10732,10 +11299,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-buffer@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-buffer@npm:1.11.6"
-  checksum: b14d0573bf680d22b2522e8a341ec451fddd645d1f9c6bd9012ccb7e587a2973b86ab7b89fe91e1c79939ba96095f503af04369a3b356c8023c13a5893221644
+"@webassemblyjs/helper-buffer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-buffer@npm:1.12.1"
+  checksum: 1d8705daa41f4d22ef7c6d422af4c530b84d69d0c253c6db5adec44d511d7caa66837803db5b1addcea611a1498fd5a67d2cf318b057a916283ae41ffb85ba8a
   languageName: node
   linkType: hard
 
@@ -10757,15 +11324,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-section@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6"
+"@webassemblyjs/helper-wasm-section@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.11.6"
-    "@webassemblyjs/helper-buffer": "npm:1.11.6"
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-    "@webassemblyjs/wasm-gen": "npm:1.11.6"
-  checksum: 38a615ab3d55f953daaf78b69f145e2cc1ff5288ab71715d1a164408b735c643a87acd7e7ba3e9633c5dd965439a45bb580266b05a06b22ff678d6c013514108
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+  checksum: e91e6b28114e35321934070a2db8973a08a5cd9c30500b817214c683bbf5269ed4324366dd93ad83bf2fba0d671ac8f39df1c142bf58f70c57a827eeba4a3d2f
   languageName: node
   linkType: hard
 
@@ -10794,68 +11361,68 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-edit@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-edit@npm:1.11.6"
+"@webassemblyjs/wasm-edit@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-edit@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.11.6"
-    "@webassemblyjs/helper-buffer": "npm:1.11.6"
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-    "@webassemblyjs/helper-wasm-section": "npm:1.11.6"
-    "@webassemblyjs/wasm-gen": "npm:1.11.6"
-    "@webassemblyjs/wasm-opt": "npm:1.11.6"
-    "@webassemblyjs/wasm-parser": "npm:1.11.6"
-    "@webassemblyjs/wast-printer": "npm:1.11.6"
-  checksum: c168bfc6d0cdd371345f36f95a4766d098a96ccc1257e6a6e3a74d987a5c4f2ddd2244a6aecfa5d032a47d74ed2c3b579e00a314d31e4a0b76ad35b31cdfa162
+    "@webassemblyjs/helper-wasm-section": "npm:1.12.1"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+    "@webassemblyjs/wasm-opt": "npm:1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:1.12.1"
+    "@webassemblyjs/wast-printer": "npm:1.12.1"
+  checksum: 5678ae02dbebba2f3a344e25928ea5a26a0df777166c9be77a467bfde7aca7f4b57ef95587e4bd768a402cdf2fddc4c56f0a599d164cdd9fe313520e39e18137
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-gen@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-gen@npm:1.11.6"
+"@webassemblyjs/wasm-gen@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-gen@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.11.6"
+    "@webassemblyjs/ast": "npm:1.12.1"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
     "@webassemblyjs/ieee754": "npm:1.11.6"
     "@webassemblyjs/leb128": "npm:1.11.6"
     "@webassemblyjs/utf8": "npm:1.11.6"
-  checksum: f91903506ce50763592863df5d80ffee80f71a1994a882a64cdb83b5e44002c715f1ef1727d8ccb0692d066af34d3d4f5e59e8f7a4e2eeb2b7c32692ac44e363
+  checksum: ec45bd50e86bc9856f80fe9af4bc1ae5c98fb85f57023d11dff2b670da240c47a7b1b9b6c89755890314212bd167cf3adae7f1157216ddffb739a4ce589fc338
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-opt@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-opt@npm:1.11.6"
+"@webassemblyjs/wasm-opt@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-opt@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.11.6"
-    "@webassemblyjs/helper-buffer": "npm:1.11.6"
-    "@webassemblyjs/wasm-gen": "npm:1.11.6"
-    "@webassemblyjs/wasm-parser": "npm:1.11.6"
-  checksum: e0cfeea381ecbbd0ca1616e9a08974acfe7fc81f8a16f9f2d39f565dc51784dd7043710b6e972f9968692d273e32486b9a8a82ca178d4bd520b2d5e2cf28234d
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:1.12.1"
+  checksum: 21f25ae109012c49bb084e09f3b67679510429adc3e2408ad3621b2b505379d9cce337799a7919ef44db64e0d136833216914aea16b0d4856f353b9778e0cdb7
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-parser@npm:1.11.6"
+"@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-parser@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.11.6"
+    "@webassemblyjs/ast": "npm:1.12.1"
     "@webassemblyjs/helper-api-error": "npm:1.11.6"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
     "@webassemblyjs/ieee754": "npm:1.11.6"
     "@webassemblyjs/leb128": "npm:1.11.6"
     "@webassemblyjs/utf8": "npm:1.11.6"
-  checksum: 6995e0b7b8ebc52b381459c6a555f87763dcd3975c4a112407682551e1c73308db7af23385972a253dceb5af94e76f9c97cb861e8239b5ed1c3e79b95d8e2097
+  checksum: f7311685b76c3e1def2abea3488be1e77f06ecd8633143a6c5c943ca289660952b73785231bb76a010055ca64645227a4bc79705c26ab7536216891b6bb36320
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-printer@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wast-printer@npm:1.11.6"
+"@webassemblyjs/wast-printer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wast-printer@npm:1.12.1"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.11.6"
+    "@webassemblyjs/ast": "npm:1.12.1"
     "@xtuc/long": "npm:4.2.2"
-  checksum: fd45fd0d693141d678cc2f6ff2d3a0d7a8884acb1c92fb0c63cf43b7978e9560be04118b12792638a39dd185640453510229e736f3049037d0c361f6435f2d5f
+  checksum: 1a6a4b6bc4234f2b5adbab0cb11a24911b03380eb1cab6fb27a2250174a279fdc6aa2f5a9cf62dd1f6d4eb39f778f488e8ff15b9deb0670dee5c5077d46cf572
   languageName: node
   linkType: hard
 
@@ -11087,12 +11654,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-import-assertions@npm:^1.7.6":
-  version: 1.8.0
-  resolution: "acorn-import-assertions@npm:1.8.0"
+"acorn-import-assertions@npm:^1.9.0":
+  version: 1.9.0
+  resolution: "acorn-import-assertions@npm:1.9.0"
   peerDependencies:
     acorn: ^8
-  checksum: d61a8a1c1eaf1ba205fb2011c664533813bb517d8b5cec4adecd44efc1dbccc76eced7d68b2a283b7704634718660ef5ccce2da6a0fbc2da2d5039abdb12d049
+  checksum: af8dd58f6b0c6a43e85849744534b99f2133835c6fcdabda9eea27d0a0da625a0d323c4793ba7cb25cf4507609d0f747c210ccc2fc9b5866de04b0e59c9c5617
   languageName: node
   linkType: hard
 
@@ -11148,7 +11715,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.11.3, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.9.0":
+"acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.11.3, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
   version: 8.11.3
   resolution: "acorn@npm:8.11.3"
   bin:
@@ -11771,13 +12338,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-from@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "array-from@npm:2.1.1"
-  checksum: 38dbc69b284ebcbbc7012c2c2a68926ece1700f00ae40f08881cd7d27db0e8efc0d349d024d1e7931be37734443323279686d44266af25abb48fb4d441e932e9
-  languageName: node
-  linkType: hard
-
 "array-includes@npm:^3.1.4, array-includes@npm:^3.1.5":
   version: 3.1.6
   resolution: "array-includes@npm:3.1.6"
@@ -12177,14 +12737,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.1.3":
-  version: 1.6.2
-  resolution: "axios@npm:1.6.2"
+"axios@npm:^1.1.3, axios@npm:^1.6.7":
+  version: 1.6.8
+  resolution: "axios@npm:1.6.8"
   dependencies:
-    follow-redirects: "npm:^1.15.0"
+    follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 612bc93f8f738a518e7c5f9de9cc782bcd36aac6bae279160ef6a10260378e21c1786520eab3336898e3d66e0839ebdf739f327fb6d0431baa4d3235703a7652
+  checksum: 3f9a79eaf1d159544fca9576261ff867cbbff64ed30017848e4210e49f3b01e97cf416390150e6fdf6633f336cd43dc1151f890bbd09c3c01ad60bb0891eee63
   languageName: node
   linkType: hard
 
@@ -12682,10 +13242,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"blo@npm:1.1.1":
-  version: 1.1.1
-  resolution: "blo@npm:1.1.1"
-  checksum: 47fac139d8aaa0dc85510fb1ada9a0c54beb20a2c485bf25eb64b51176397e58aa95da5c414139c95171d080a5bf3385afffea2b176b449d24c69605833d7868
+"blo@npm:1.2.0":
+  version: 1.2.0
+  resolution: "blo@npm:1.2.0"
+  checksum: 17ec61e41b201bbba8ab3c874cad94696604b6ac4029de5050c92ea5817dff6814d8642b9b2948e0d6804194437b751fa2755652201f26fa5d606913c489b757
   languageName: node
   linkType: hard
 
@@ -12710,27 +13270,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.1":
-  version: 1.20.1
-  resolution: "body-parser@npm:1.20.1"
-  dependencies:
-    bytes: "npm:3.1.2"
-    content-type: "npm:~1.0.4"
-    debug: "npm:2.6.9"
-    depd: "npm:2.0.0"
-    destroy: "npm:1.2.0"
-    http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.4.24"
-    on-finished: "npm:2.4.1"
-    qs: "npm:6.11.0"
-    raw-body: "npm:2.5.1"
-    type-is: "npm:~1.6.18"
-    unpipe: "npm:1.0.0"
-  checksum: 5f8d128022a2fb8b6e7990d30878a0182f300b70e46b3f9d358a9433ad6275f0de46add6d63206da3637c01c3b38b6111a7480f7e7ac2e9f7b989f6133fe5510
-  languageName: node
-  linkType: hard
-
-"body-parser@npm:^1.15.2, body-parser@npm:^1.20.0":
+"body-parser@npm:1.20.2, body-parser@npm:^1.15.2, body-parser@npm:^1.20.0":
   version: 1.20.2
   resolution: "body-parser@npm:1.20.2"
   dependencies:
@@ -12905,20 +13445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brfs@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "brfs@npm:2.0.2"
-  dependencies:
-    quote-stream: "npm:^1.0.1"
-    resolve: "npm:^1.1.5"
-    static-module: "npm:^3.0.2"
-    through2: "npm:^2.0.0"
-  bin:
-    brfs: bin/cmd.js
-  checksum: fe4881c9bf8a1a67236a6de0f0a1508441dff357552c891ef92918bdbcdc72b275853c91ffcc0f61227c1e18d6da48843859d17c7b9a2214a800d09e63d02a33
-  languageName: node
-  linkType: hard
-
 "brorand@npm:^1.0.1, brorand@npm:^1.0.5, brorand@npm:^1.1.0":
   version: 1.1.0
   resolution: "brorand@npm:1.1.0"
@@ -13116,7 +13642,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.9, browserslist@npm:^4.22.1, browserslist@npm:^4.23.0":
+"browserslist@npm:^4.12.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.9, browserslist@npm:^4.22.1, browserslist@npm:^4.23.0":
   version: 4.23.0
   resolution: "browserslist@npm:4.23.0"
   dependencies:
@@ -13208,13 +13734,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-equal@npm:0.0.1":
-  version: 0.0.1
-  resolution: "buffer-equal@npm:0.0.1"
-  checksum: ca4b52e6c01143529d957a78cb9a93e4257f172bbab30d9eb87c20ae085ed23c5e07f236ac051202dacbf3d17aba42e1455f84cba21ea79b67d57f2b05e9a613
-  languageName: node
-  linkType: hard
-
 "buffer-equal@npm:^1.0.0":
   version: 1.0.0
   resolution: "buffer-equal@npm:1.0.0"
@@ -14542,6 +15061,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"contentful-resolve-response@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "contentful-resolve-response@npm:1.8.1"
+  dependencies:
+    fast-copy: "npm:^2.1.7"
+  checksum: 6023824e98843d47c900501d2252336dd1dfebe8d868cb81b650252f5946963063cbe2b466e8e2238d41634a779dbfe4a43ba6c7996ca77124824c2554f66cab
+  languageName: node
+  linkType: hard
+
+"contentful-sdk-core@npm:^8.1.0":
+  version: 8.1.2
+  resolution: "contentful-sdk-core@npm:8.1.2"
+  dependencies:
+    fast-copy: "npm:^2.1.7"
+    lodash.isplainobject: "npm:^4.0.6"
+    lodash.isstring: "npm:^4.0.1"
+    p-throttle: "npm:^4.1.1"
+    qs: "npm:^6.11.2"
+  checksum: 9e5b6dc1b2a1a91a9c4a01b0f24aff23606d0a6f7b56b7ca5930d57f4c29503886874e2ac653d924b742e9445da31b862c651b2d98e1f74ec35f6f0a3afdb912
+  languageName: node
+  linkType: hard
+
+"contentful@npm:^10.8.7":
+  version: 10.8.7
+  resolution: "contentful@npm:10.8.7"
+  dependencies:
+    "@contentful/rich-text-types": "npm:^16.0.2"
+    axios: "npm:^1.6.7"
+    contentful-resolve-response: "npm:^1.8.1"
+    contentful-sdk-core: "npm:^8.1.0"
+    json-stringify-safe: "npm:^5.0.1"
+    type-fest: "npm:^4.0.0"
+  checksum: db0bf6342ed9fdc577c583bc627626ea95ee2af3a0b47600fae48dbb1354f64bc226174c4d98dfd224d4f991391d1bfa367a5a01bad9ea44fbc5f9f424de6798
+  languageName: node
+  linkType: hard
+
 "continuable-cache@npm:^0.3.1":
   version: 0.3.1
   resolution: "continuable-cache@npm:0.3.1"
@@ -15109,13 +15664,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dash-ast@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "dash-ast@npm:1.0.0"
-  checksum: f74b0ad6439f45b860ab75085c88645c75986255fd403b8cb10407f7d8b7a41a201db0a32d3a9e0941df89e9ccc27a6a15fa31208c9cd8f452f9d8486c8c841e
-  languageName: node
-  linkType: hard
-
 "data-uri-to-buffer@npm:^6.0.0":
   version: 6.0.1
   resolution: "data-uri-to-buffer@npm:6.0.1"
@@ -15358,7 +15906,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-is@npm:^0.1.3, deep-is@npm:~0.1.3":
+"deep-is@npm:^0.1.3":
   version: 0.1.3
   resolution: "deep-is@npm:0.1.3"
   checksum: dee1094e987a784a9a9c8549fc65eeca3422aef3bf2f9579f76c126085f280311d09273826c2f430d84fd09d64f6a578e5e7a4ac6ba1d50ea6cff0ddf605c025
@@ -16165,7 +16713,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexer2@npm:^0.1.2, duplexer2@npm:~0.1.0, duplexer2@npm:~0.1.2, duplexer2@npm:~0.1.4":
+"duplexer2@npm:^0.1.2, duplexer2@npm:~0.1.0, duplexer2@npm:~0.1.2":
   version: 0.1.4
   resolution: "duplexer2@npm:0.1.4"
   dependencies:
@@ -16387,13 +16935,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.14.0, enhanced-resolve@npm:^5.14.1":
-  version: 5.15.0
-  resolution: "enhanced-resolve@npm:5.15.0"
+"enhanced-resolve@npm:^5.14.1, enhanced-resolve@npm:^5.16.0":
+  version: 5.16.0
+  resolution: "enhanced-resolve@npm:5.16.0"
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 180c3f2706f9117bf4dc7982e1df811dad83a8db075723f299245ef4488e0cad7e96859c5f0e410682d28a4ecd4da021ec7d06265f7e4eb6eed30c69ca5f7d3e
+  checksum: 47f123676b9b179b35195769b9d9523f314f6fc3a13d4461a4d95d5beaec9adc26aaa3b60b61f93e21ed1290dff0e9d9e67df343ec47f4480669a8e26ffe52a3
   languageName: node
   linkType: hard
 
@@ -16608,7 +17156,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-iterator@npm:2.0.3, es6-iterator@npm:^2.0.1, es6-iterator@npm:~2.0.1, es6-iterator@npm:~2.0.3":
+"es6-iterator@npm:2.0.3, es6-iterator@npm:^2.0.1, es6-iterator@npm:~2.0.3":
   version: 2.0.3
   resolution: "es6-iterator@npm:2.0.3"
   dependencies:
@@ -16619,20 +17167,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-map@npm:^0.1.5":
-  version: 0.1.5
-  resolution: "es6-map@npm:0.1.5"
-  dependencies:
-    d: "npm:1"
-    es5-ext: "npm:~0.10.14"
-    es6-iterator: "npm:~2.0.1"
-    es6-set: "npm:~0.1.5"
-    es6-symbol: "npm:~3.1.1"
-    event-emitter: "npm:~0.3.5"
-  checksum: ca271c8efcd5b03bc430fe7508803b8b47c1db2956299b538a68244a3473d176536ee10db2db3b31174c71f83d6a6d67dff8311ad25ec6e71a7ffae01f4ca9d2
-  languageName: node
-  linkType: hard
-
 "es6-object-assign@npm:^1.1.0":
   version: 1.1.0
   resolution: "es6-object-assign@npm:1.1.0"
@@ -16656,20 +17190,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-set@npm:^0.1.5, es6-set@npm:~0.1.5":
-  version: 0.1.5
-  resolution: "es6-set@npm:0.1.5"
-  dependencies:
-    d: "npm:1"
-    es5-ext: "npm:~0.10.14"
-    es6-iterator: "npm:~2.0.1"
-    es6-symbol: "npm:3.1.1"
-    event-emitter: "npm:~0.3.5"
-  checksum: b1f1064eba2e85a14003967883b384a520da86fa6369e44ef0e700b68cce96330c88403d8c193b90ccd8cf4cc7e8127ce205d0920ee9d2f710a7c4b35c1cabb3
-  languageName: node
-  linkType: hard
-
-"es6-symbol@npm:3.1.1, es6-symbol@npm:^3.1.1, es6-symbol@npm:~3.1.1":
+"es6-symbol@npm:^3.1.1, es6-symbol@npm:~3.1.1":
   version: 3.1.1
   resolution: "es6-symbol@npm:3.1.1"
   dependencies:
@@ -16908,25 +17429,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^1.11.1":
-  version: 1.14.3
-  resolution: "escodegen@npm:1.14.3"
-  dependencies:
-    esprima: "npm:^4.0.1"
-    estraverse: "npm:^4.2.0"
-    esutils: "npm:^2.0.2"
-    optionator: "npm:^0.8.1"
-    source-map: "npm:~0.6.1"
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 70f095ca9393535f9f1c145ef99dc0b3ff14cca6bc4a79d90ff3352f90c3f2e07f75af6d6c05174ea67c45271f75e80dd440dd7d04ed2cf44c9452c3042fa84a
-  languageName: node
-  linkType: hard
-
 "escodegen@npm:^2.0.0, escodegen@npm:^2.1.0":
   version: 2.1.0
   resolution: "escodegen@npm:2.1.0"
@@ -17441,7 +17943,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0":
+"estraverse@npm:^4.1.1":
   version: 4.3.0
   resolution: "estraverse@npm:4.3.0"
   checksum: 3f67ad02b6dbfaddd9ea459cf2b6ef4ecff9a6082a7af9d22e445b9abc082ad9ca47e1825557b293fcdae477f4714e561123e30bb6a5b2f184fb2bad4a9497eb
@@ -17455,13 +17957,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-is-function@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "estree-is-function@npm:1.0.0"
-  checksum: eb4c0ca96f75f1fe14e4520823d40b55266377c50f81201e0172ac2c879c2770d1e6145897748b67e4855821a7e58e31e04d14ec32fd6132845dd068627b60d8
-  languageName: node
-  linkType: hard
-
 "estree-to-babel@npm:^3.1.0":
   version: 3.2.1
   resolution: "estree-to-babel@npm:3.2.1"
@@ -17731,17 +18226,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethjs-unit@npm:^0.1.6":
-  version: 0.1.6
-  resolution: "ethjs-unit@npm:0.1.6"
-  dependencies:
-    bn.js: "npm:4.11.6"
-    number-to-bn: "npm:1.7.0"
-  checksum: 35086cb671806992ec36d5dd43ab67e68ad7a9237e42c0e963f9081c88e40147cda86c1a258b0a3180bf2b7bc1960e607c5bcaefdb2196e0f3564acf73276189
-  languageName: node
-  linkType: hard
-
-"event-emitter@npm:^0.3.5, event-emitter@npm:~0.3.5":
+"event-emitter@npm:^0.3.5":
   version: 0.3.5
   resolution: "event-emitter@npm:0.3.5"
   dependencies:
@@ -17956,12 +18441,12 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.18.1":
-  version: 4.18.2
-  resolution: "express@npm:4.18.2"
+  version: 4.18.3
+  resolution: "express@npm:4.18.3"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.1"
+    body-parser: "npm:1.20.2"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
     cookie: "npm:0.5.0"
@@ -17990,7 +18475,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 869ae89ed6ff4bed7b373079dc58e5dddcf2915a2669b36037ff78c99d675ae930e5fe052b35c24f56557d28a023bb1cbe3e2f2fb87eaab96a1cedd7e597809d
+  checksum: 0bf4656d0020cdc477aec884c6245dceea78992f6c747c899c87dbb0598474658d4130a29c80f02c99d1f0d6ebef706e7131c70c5454c3e07aba761c5bd3d627
   languageName: node
   linkType: hard
 
@@ -18134,6 +18619,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-copy@npm:^2.1.7":
+  version: 2.1.7
+  resolution: "fast-copy@npm:2.1.7"
+  checksum: 0651a334d42e567f48e6efa9595202f3613353d7b46a1c4e6e055e3ab508583e4819f1bc06722588bd121680722923ba26bcfa6100661e8171a914893fb77e62
+  languageName: node
+  linkType: hard
+
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
@@ -18196,7 +18688,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-levenshtein@npm:^2.0.6, fast-levenshtein@npm:~2.0.4":
+"fast-levenshtein@npm:^2.0.6":
   version: 2.0.6
   resolution: "fast-levenshtein@npm:2.0.6"
   checksum: eb7e220ecf2bab5159d157350b81d01f75726a4382f5a9266f42b9150c4523b9795f7f5d9fbbbeaeac09a441b2369f05ee02db48ea938584205530fe5693cfe1
@@ -18262,6 +18754,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"faye-websocket@npm:0.11.4":
+  version: 0.11.4
+  resolution: "faye-websocket@npm:0.11.4"
+  dependencies:
+    websocket-driver: "npm:>=0.5.1"
+  checksum: 22433c14c60925e424332d2794463a8da1c04848539b5f8db5fced62a7a7c71a25335a4a8b37334e3a32318835e2b87b1733d008561964121c4a0bd55f0878c3
+  languageName: node
+  linkType: hard
+
 "faye-websocket@npm:~0.10.0":
   version: 0.10.0
   resolution: "faye-websocket@npm:0.10.0"
@@ -18607,6 +19108,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"firebase@npm:^10.11.0":
+  version: 10.11.0
+  resolution: "firebase@npm:10.11.0"
+  dependencies:
+    "@firebase/analytics": "npm:0.10.2"
+    "@firebase/analytics-compat": "npm:0.2.8"
+    "@firebase/app": "npm:0.10.1"
+    "@firebase/app-check": "npm:0.8.3"
+    "@firebase/app-check-compat": "npm:0.3.10"
+    "@firebase/app-compat": "npm:0.2.31"
+    "@firebase/app-types": "npm:0.9.1"
+    "@firebase/auth": "npm:1.7.1"
+    "@firebase/auth-compat": "npm:0.5.6"
+    "@firebase/database": "npm:1.0.4"
+    "@firebase/database-compat": "npm:1.0.4"
+    "@firebase/firestore": "npm:4.6.0"
+    "@firebase/firestore-compat": "npm:0.3.29"
+    "@firebase/functions": "npm:0.11.4"
+    "@firebase/functions-compat": "npm:0.3.10"
+    "@firebase/installations": "npm:0.6.6"
+    "@firebase/installations-compat": "npm:0.2.6"
+    "@firebase/messaging": "npm:0.12.8"
+    "@firebase/messaging-compat": "npm:0.2.8"
+    "@firebase/performance": "npm:0.6.6"
+    "@firebase/performance-compat": "npm:0.2.6"
+    "@firebase/remote-config": "npm:0.4.6"
+    "@firebase/remote-config-compat": "npm:0.2.6"
+    "@firebase/storage": "npm:0.12.4"
+    "@firebase/storage-compat": "npm:0.3.7"
+    "@firebase/util": "npm:1.9.5"
+  checksum: b57ccbceaa528889cfaeb105f037fe3b5a91e3f7586f94cd1018197715d4daff6b1daf0dd3c070c5446c343f22960dacd0a2207b026b2a938f3affc3bba84c8e
+  languageName: node
+  linkType: hard
+
 "first-chunk-stream@npm:3.0.0, first-chunk-stream@npm:^3.0.0":
   version: 3.0.0
   resolution: "first-chunk-stream@npm:3.0.0"
@@ -18700,13 +19235,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0":
-  version: 1.15.3
-  resolution: "follow-redirects@npm:1.15.3"
+"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6":
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 60d98693f4976892f8c654b16ef6d1803887a951898857ab0cdc009570b1c06314ad499505b7a040ac5b98144939f8597766e5e6a6859c0945d157b473aa6f5f
+  checksum: 70c7612c4cab18e546e36b991bbf8009a1a41cf85354afe04b113d1117569abf760269409cb3eb842d9f7b03d62826687086b081c566ea7b1e6613cf29030bf7
   languageName: node
   linkType: hard
 
@@ -19182,7 +19717,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-assigned-identifiers@npm:^1.1.0, get-assigned-identifiers@npm:^1.2.0":
+"get-assigned-identifiers@npm:^1.2.0":
   version: 1.2.0
   resolution: "get-assigned-identifiers@npm:1.2.0"
   checksum: 5ea831c744a645ebd56fff818c80ffc583995c2ca3958236c7cfaac670242300e4f08498a9bbafd3ecbe30027d58ed50e7fa6268ecfe4b8e5c888ea7275cb56c
@@ -19763,7 +20298,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
+"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
   checksum: bf152d0ed1dc159239db1ba1f74fdbc40cb02f626770dcd5815c427ce0688c2635a06ed69af364396da4636d0408fcf7d4afdf7881724c3307e46aff30ca49e2
@@ -20221,7 +20756,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has@npm:^1.0.0, has@npm:^1.0.1, has@npm:^1.0.3":
+"has@npm:^1.0.0, has@npm:^1.0.3":
   version: 1.0.3
   resolution: "has@npm:1.0.3"
   dependencies:
@@ -20743,6 +21278,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"idb@npm:7.1.1":
+  version: 7.1.1
+  resolution: "idb@npm:7.1.1"
+  checksum: 8e33eaebf21055129864acb89932e0739b8c96788e559df24c253ce114d8c6deb977a3b30ea47a9bb8a2ae8a55964861c3df65f360d95745e341cee40d5c17f4
+  languageName: node
+  linkType: hard
+
 "idna-uts46-hx@npm:^2.3.1":
   version: 2.3.1
   resolution: "idna-uts46-hx@npm:2.3.1"
@@ -20794,9 +21336,9 @@ __metadata:
   linkType: hard
 
 "immer@npm:^9.0.6":
-  version: 9.0.6
-  resolution: "immer@npm:9.0.6"
-  checksum: e5c87b491188946423749e4858d07650414d84cbe82807923ade938cf58ea8db69a72ec72be99e768996c4aac9dc1ece4bc553683ee3c146119090dfd9181b77
+  version: 9.0.21
+  resolution: "immer@npm:9.0.21"
+  checksum: 8455d6b4dc8abfe40f06eeec9bcc944d147c81279424c0f927a4d4905ae34e5af19ab6da60bcc700c14f51c452867d7089b3b9236f5a9a2248e39b4a09ee89de
   languageName: node
   linkType: hard
 
@@ -23533,16 +24075,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-core@npm:^15.1.2":
-  version: 15.1.2
-  resolution: "lavamoat-core@npm:15.1.2"
+"lavamoat-core@npm:^15.1.2, lavamoat-core@npm:^15.2.1":
+  version: 15.3.0
+  resolution: "lavamoat-core@npm:15.3.0"
   dependencies:
-    "@babel/types": "npm:7.23.9"
+    "@babel/types": "npm:7.24.0"
     json-stable-stringify: "npm:1.1.1"
-    lavamoat-tofu: "npm:^7.2.0"
+    lavamoat-tofu: "npm:^7.2.3"
     merge-deep: "npm:3.0.3"
-    type-fest: "npm:4.10.2"
-  checksum: a29625b74afbd3346bc3d8b19f5bc210248e237065df3add28fefb23f4d65eb5cc889260275bfa0cd24ee59a609f3c3e6453376e7173cb96c3bc8da135eb83f4
+    type-fest: "npm:4.13.1"
+  checksum: 567e186017eba440a683c2d286fce14ca050762c3a24d80f4b57fd00aab3762680180ce867fff6bb301051fb3cc5a74506515fdd5b9f87a3b571f4e6edc8043d
   languageName: node
   linkType: hard
 
@@ -23558,34 +24100,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-tofu@npm:^7.1.0, lavamoat-tofu@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "lavamoat-tofu@npm:7.2.0"
+"lavamoat-tofu@npm:^7.1.0, lavamoat-tofu@npm:^7.2.3":
+  version: 7.2.3
+  resolution: "lavamoat-tofu@npm:7.2.3"
   dependencies:
-    "@babel/parser": "npm:7.23.9"
-    "@babel/traverse": "npm:7.23.9"
-    "@babel/types": "npm:7.23.9"
+    "@babel/parser": "npm:7.24.0"
+    "@babel/traverse": "npm:7.24.0"
+    "@babel/types": "npm:7.24.0"
     "@types/babel__traverse": "npm:7.20.5"
-    type-fest: "npm:4.10.2"
+    type-fest: "npm:4.13.1"
   peerDependencies:
-    lavamoat-core: ^15.1.2
-  checksum: 66ddd5075ad4543a8376a7047d1461225da483e8f9c312dec44305b0ea6636e34f3540d0970b0a88a96db292bfbd2eb4fe4f6afc652d255a514cb918d21348b8
+    lavamoat-core: ^15.3.0
+  checksum: c0f67b47107b1fa6b319c37fca74611adb42b0d1bcf593923dd200e8de1783ff3f05435f806842cef888cfd2b8d589889541b8fdaa7aeb445482516dc0e8bfcc
   languageName: node
   linkType: hard
 
-"lavamoat-viz@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "lavamoat-viz@npm:7.0.2"
+"lavamoat-viz@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "lavamoat-viz@npm:7.0.5"
   dependencies:
-    lavamoat-core: "npm:^15.1.1"
+    lavamoat-core: "npm:^15.2.1"
     ncp: "npm:2.0.0"
-    open: "npm:7.4.2"
-    pify: "npm:4.0.1"
+    open: "npm:8.4.2"
+    pify: "npm:5.0.0"
     serve-handler: "npm:6.1.5"
     yargs: "npm:17.7.2"
   bin:
     lavamoat-viz: bin/index.js
-  checksum: 3bbcbe7489560b6020b0e1dfb9b14b85d12fb51c580d458a0b91ab6ae61a474868778aeefedf6c71e685f9464ed49f998747d49ad72d2ab1cf533ab2a5535aa3
+  checksum: c183f25667d7f82cf854eb21cf6e11525d3dd0902fffa6b745d49043a9484164f149106cba043dd0857d196fcde1613ce18fa26d84c117a7fb84f9765c2595bb
   languageName: node
   linkType: hard
 
@@ -23734,16 +24276,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"levn@npm:~0.3.0":
-  version: 0.3.0
-  resolution: "levn@npm:0.3.0"
-  dependencies:
-    prelude-ls: "npm:~1.1.2"
-    type-check: "npm:~0.3.2"
-  checksum: e1c3e75b5c430d9aa4c32c83c8a611e4ca53608ca78e3ea3bf6bbd9d017e4776d05d86e27df7901baebd3afa732abede9f26f715b8c1be19e95505c7a3a7b589
-  languageName: node
-  linkType: hard
-
 "lie@npm:3.1.1":
   version: 3.1.1
   resolution: "lie@npm:3.1.1"
@@ -24013,6 +24545,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.isstring@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "lodash.isstring@npm:4.0.1"
+  checksum: eaac87ae9636848af08021083d796e2eea3d02e80082ab8a9955309569cb3a463ce97fd281d7dc119e402b2e7d8c54a23914b15d2fc7fff56461511dc8937ba0
+  languageName: node
+  linkType: hard
+
 "lodash.memoize@npm:~3.0.3":
   version: 3.0.4
   resolution: "lodash.memoize@npm:3.0.4"
@@ -24207,15 +24746,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:0.25.1":
-  version: 0.25.1
-  resolution: "magic-string@npm:0.25.1"
-  dependencies:
-    sourcemap-codec: "npm:^1.4.1"
-  checksum: 62c6b9f33798743ee9ebd169556eda06dbf1ec7af8661b9297b2da2a029cf91bc99829a97d32a1857f7e94c10eeaf49db161cb8e4cbba4d4218f3bffc885e9f5
-  languageName: node
-  linkType: hard
-
 "magic-string@npm:^0.25.7":
   version: 0.25.7
   resolution: "magic-string@npm:0.25.7"
@@ -24784,15 +25314,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge-source-map@npm:1.0.4":
-  version: 1.0.4
-  resolution: "merge-source-map@npm:1.0.4"
-  dependencies:
-    source-map: "npm:^0.5.6"
-  checksum: 86a4e60d83980393e61f069c7ae33e7899c4c012c3cd2cf50e01482e7a284bbe9c8cd08d37adbf241fc9eacfa4425241432e7461cf6559f7e9902587889660de
-  languageName: node
-  linkType: hard
-
 "merge-source-map@npm:^1.1.0":
   version: 1.1.0
   resolution: "merge-source-map@npm:1.1.0"
@@ -24816,7 +25337,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mersenne-twister@npm:^1.0.1, mersenne-twister@npm:^1.1.0":
+"mersenne-twister@npm:^1.1.0":
   version: 1.1.0
   resolution: "mersenne-twister@npm:1.1.0"
   checksum: 1123526199091097102f2f91639ad7d5b3df4b098de9a4a72c835920e11ef0ce08e25737d5af1d363325a60da8804365eae8a41e03b7a46a1acc22e18fa8f261
@@ -24840,8 +25361,8 @@ __metadata:
     "@babel/register": "npm:^7.22.15"
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch"
     "@blockaid/ppom_release": "npm:^1.4.6"
+    "@contentful/rich-text-html-renderer": "npm:^16.3.5"
     "@ensdomains/content-hash": "npm:^2.5.7"
-    "@ethereumjs/common": "npm:^3.1.1"
     "@ethereumjs/tx": "npm:^4.1.1"
     "@ethersproject/abi": "npm:^5.6.4"
     "@ethersproject/bignumber": "npm:^5.7.0"
@@ -24858,26 +25379,26 @@ __metadata:
     "@lavamoat/snow": "npm:^2.0.1"
     "@lgbot/madge": "npm:^6.2.0"
     "@material-ui/core": "npm:^4.11.0"
-    "@metamask-institutional/custody-controller": "npm:^0.2.23"
-    "@metamask-institutional/custody-keyring": "npm:^1.0.11"
-    "@metamask-institutional/extension": "npm:^0.3.19"
-    "@metamask-institutional/institutional-features": "npm:^1.2.14"
-    "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
-    "@metamask-institutional/rpc-allowlist": "npm:^1.0.2"
-    "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/transaction-update": "npm:^0.1.37"
+    "@metamask-institutional/custody-controller": "npm:^0.2.27"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/extension": "npm:^0.3.24"
+    "@metamask-institutional/institutional-features": "npm:^1.3.2"
+    "@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
+    "@metamask-institutional/rpc-allowlist": "npm:^1.0.3"
+    "@metamask-institutional/sdk": "npm:^0.1.26"
+    "@metamask-institutional/transaction-update": "npm:^0.2.2"
     "@metamask/abi-utils": "npm:^2.0.2"
     "@metamask/accounts-controller": "npm:^11.0.0"
-    "@metamask/address-book-controller": "npm:^3.1.7"
-    "@metamask/announcement-controller": "npm:^5.0.1"
-    "@metamask/approval-controller": "npm:^6.0.0"
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A26.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-26.0.0-17c0e9432c.patch"
+    "@metamask/address-book-controller": "npm:^4.0.1"
+    "@metamask/announcement-controller": "npm:^6.1.0"
+    "@metamask/approval-controller": "npm:^6.0.1"
+    "@metamask/assets-controllers": "npm:^29.0.0"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^4.1.0"
     "@metamask/browser-passworder": "npm:^4.3.0"
     "@metamask/build-utils": "npm:^1.0.0"
-    "@metamask/contract-metadata": "npm:^2.3.1"
-    "@metamask/controller-utils": "patch:@metamask/controller-utils@npm%3A8.0.4#~/.yarn/patches/@metamask-controller-utils-npm-8.0.4-077edd6162.patch"
+    "@metamask/contract-metadata": "npm:^2.5.0"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/design-tokens": "npm:^2.1.1"
     "@metamask/desktop": "npm:^0.3.0"
     "@metamask/ens-controller": "npm:^9.0.0"
@@ -24886,9 +25407,9 @@ __metadata:
     "@metamask/eslint-config-mocha": "npm:^9.0.0"
     "@metamask/eslint-config-nodejs": "npm:^9.0.0"
     "@metamask/eslint-config-typescript": "npm:^9.0.1"
+    "@metamask/eslint-plugin-design-tokens": "npm:^1.1.0"
     "@metamask/eth-json-rpc-filters": "npm:^7.0.0"
     "@metamask/eth-json-rpc-middleware": "npm:^12.1.0"
-    "@metamask/eth-keyring-controller": "npm:^16.0.0"
     "@metamask/eth-ledger-bridge-keyring": "npm:^2.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/eth-sig-util": "npm:^7.0.1"
@@ -24900,44 +25421,47 @@ __metadata:
     "@metamask/ethjs-contract": "npm:^0.4.1"
     "@metamask/ethjs-query": "npm:^0.7.1"
     "@metamask/forwarder": "npm:^1.1.0"
-    "@metamask/gas-fee-controller": "patch:@metamask/gas-fee-controller@npm%3A14.0.1#~/.yarn/patches/@metamask-gas-fee-controller-npm-14.0.1-59e9d16a4e.patch"
+    "@metamask/gas-fee-controller": "npm:^15.0.0"
     "@metamask/jazzicon": "npm:^2.0.0"
     "@metamask/keyring-api": "npm:^3.0.0"
-    "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch"
+    "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch"
     "@metamask/logging-controller": "npm:^2.0.2"
     "@metamask/logo": "npm:^3.1.2"
     "@metamask/message-manager": "npm:^7.3.0"
+    "@metamask/message-signing-snap": "npm:^0.3.3"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/name-controller": "npm:^4.2.0"
-    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.0.1#~/.yarn/patches/@metamask-network-controller-npm-18.0.1-c4d0cfaecd.patch"
+    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch"
     "@metamask/notification-controller": "npm:^3.0.0"
     "@metamask/obs-store": "npm:^8.1.0"
-    "@metamask/permission-controller": "npm:^8.0.0"
+    "@metamask/permission-controller": "npm:^9.0.1"
     "@metamask/permission-log-controller": "npm:^1.0.0"
-    "@metamask/phishing-controller": "npm:^8.0.0"
+    "@metamask/phishing-controller": "npm:^9.0.2"
     "@metamask/phishing-warning": "npm:^3.0.3"
     "@metamask/post-message-stream": "npm:^8.0.0"
-    "@metamask/ppom-validator": "npm:^0.29.0"
+    "@metamask/ppom-validator": "npm:^0.30.0"
     "@metamask/providers": "npm:^14.0.2"
-    "@metamask/queued-request-controller": "npm:^0.6.0"
+    "@metamask/queued-request-controller": "npm:^0.10.0"
     "@metamask/rate-limit-controller": "npm:^3.0.0"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"
-    "@metamask/selected-network-controller": "npm:^9.0.0"
+    "@metamask/selected-network-controller": "npm:^13.0.0"
     "@metamask/signature-controller": "npm:^12.0.0"
-    "@metamask/smart-transactions-controller": "npm:^6.2.2"
-    "@metamask/snaps-controllers": "npm:^6.0.3"
-    "@metamask/snaps-execution-environments": "npm:^5.0.3"
-    "@metamask/snaps-rpc-methods": "npm:^7.0.1"
-    "@metamask/snaps-sdk": "npm:^3.1.1"
-    "@metamask/snaps-utils": "npm:^7.1.0"
+    "@metamask/smart-transactions-controller": "npm:^10.0.1"
+    "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch"
+    "@metamask/snaps-execution-environments": "npm:^6.0.2"
+    "@metamask/snaps-rpc-methods": "npm:^8.0.0"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
+    "@metamask/snaps-utils": "npm:^7.1.1"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
-    "@metamask/transaction-controller": "npm:^27.0.1"
-    "@metamask/user-operation-controller": "npm:^6.0.0"
+    "@metamask/transaction-controller": "npm:^29.0.0"
+    "@metamask/user-operation-controller": "npm:^8.0.1"
     "@metamask/utils": "npm:^8.2.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"
+    "@noble/ciphers": "npm:^0.5.2"
     "@noble/hashes": "npm:^1.3.3"
+    "@octokit/core": "npm:^3.6.0"
     "@playwright/test": "npm:^1.39.0"
     "@popperjs/core": "npm:^2.4.0"
     "@reduxjs/toolkit": "npm:^1.6.2"
@@ -25013,15 +25537,15 @@ __metadata:
     base64-js: "npm:^1.5.1"
     bify-module-groups: "npm:^2.0.0"
     bignumber.js: "npm:^4.1.0"
-    blo: "npm:1.1.1"
+    blo: "npm:1.2.0"
     bn.js: "npm:^5.2.1"
     bowser: "npm:^2.11.0"
-    brfs: "npm:^2.0.2"
     browserify: "npm:^17.0.0"
     chalk: "npm:^4.1.2"
     chokidar: "npm:^3.5.3"
     classnames: "npm:^2.2.6"
     concurrently: "npm:^8.2.2"
+    contentful: "npm:^10.8.7"
     copy-to-clipboard: "npm:^3.3.3"
     copy-webpack-plugin: "npm:^12.0.2"
     cross-spawn: "npm:^7.0.3"
@@ -25063,6 +25587,7 @@ __metadata:
     fancy-log: "npm:^1.3.3"
     fast-glob: "npm:^3.2.2"
     fast-json-patch: "npm:^3.1.1"
+    firebase: "npm:^10.11.0"
     fs-extra: "npm:^8.1.0"
     fuse.js: "npm:^3.2.0"
     ganache: "patch:ganache@npm%3A7.9.2#~/.yarn/patches/ganache-npm-7.9.2-a70dc8da34.patch"
@@ -25098,7 +25623,7 @@ __metadata:
     labeled-stream-splicer: "npm:^2.0.2"
     lavamoat: "npm:^8.0.2"
     lavamoat-browserify: "npm:^17.0.4"
-    lavamoat-viz: "npm:^7.0.2"
+    lavamoat-viz: "npm:^7.0.5"
     localforage: "npm:^1.9.0"
     lockfile-lint: "npm:^4.10.6"
     lodash: "npm:^4.17.21"
@@ -25114,7 +25639,6 @@ __metadata:
     nyc: "npm:^15.1.0"
     obj-multiplex: "npm:^1.0.0"
     pify: "npm:^5.0.0"
-    polyfill-crypto.getrandomvalues: "npm:^1.0.0"
     postcss: "npm:^8.4.32"
     postcss-rtlcss: "npm:^4.0.9"
     prettier: "npm:^2.7.1"
@@ -25179,7 +25703,7 @@ __metadata:
     ts-node: "npm:^10.9.2"
     tsx: "npm:^4.7.1"
     ttest: "npm:^2.1.1"
-    typescript: "npm:~5.3.3"
+    typescript: "npm:~5.4.5"
     unicode-confusables: "npm:^0.1.1"
     uuid: "npm:^8.3.2"
     vinyl: "npm:^2.2.1"
@@ -25188,9 +25712,9 @@ __metadata:
     vinyl-sourcemaps-apply: "npm:^0.2.1"
     wait-on: "npm:^7.0.1"
     watchify: "npm:^4.0.0"
-    web3-stream-provider: "npm:^4.0.0"
+    web3-stream-provider: "npm:^5.0.0"
     webextension-polyfill: "npm:^0.8.0"
-    webpack: "npm:^5.75.0"
+    webpack: "npm:^5.91.0"
     yaml: "npm:^2.4.1"
     yargs: "npm:^17.7.2"
     zxcvbn: "npm:^4.4.2"
@@ -25767,7 +26291,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.1.0, minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7":
+"minimist@npm:^1.1.0, minimist@npm:^1.1.1, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
   checksum: 908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f
@@ -26877,7 +27401,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.3, object-inspect@npm:^1.6.0, object-inspect@npm:^1.9.0":
+"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
   version: 1.12.3
   resolution: "object-inspect@npm:1.12.3"
   checksum: 532b0036f0472f561180fac0d04fe328ee01f57637624c83fb054f81b5bfe966cdf4200612a499ed391a7ca3c46b20a0bc3a55fc8241d944abe687c556a32b39
@@ -27091,17 +27615,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"open@npm:7.4.2, open@npm:^7.3.1":
-  version: 7.4.2
-  resolution: "open@npm:7.4.2"
-  dependencies:
-    is-docker: "npm:^2.0.0"
-    is-wsl: "npm:^2.1.1"
-  checksum: 4fc02ed3368dcd5d7247ad3566433ea2695b0713b041ebc0eeb2f0f9e5d4e29fc2068f5cdd500976b3464e77fe8b61662b1b059c73233ccc601fe8b16d6c1cd6
-  languageName: node
-  linkType: hard
-
-"open@npm:^8.0.4, open@npm:^8.4.0":
+"open@npm:8.4.2, open@npm:^8.0.4, open@npm:^8.4.0":
   version: 8.4.2
   resolution: "open@npm:8.4.2"
   dependencies:
@@ -27112,17 +27626,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"optionator@npm:^0.8.1":
-  version: 0.8.2
-  resolution: "optionator@npm:0.8.2"
+"open@npm:^7.3.1":
+  version: 7.4.2
+  resolution: "open@npm:7.4.2"
   dependencies:
-    deep-is: "npm:~0.1.3"
-    fast-levenshtein: "npm:~2.0.4"
-    levn: "npm:~0.3.0"
-    prelude-ls: "npm:~1.1.2"
-    type-check: "npm:~0.3.2"
-    wordwrap: "npm:~1.0.0"
-  checksum: 2db05836043a9830f066fd6c1ab775ff59517330ec2882e8ed06465a1085046fa0e050e5dcfb7c0b7bf9d40199c87b55bd6c4654a4736c442ecbbf2c8fc8786b
+    is-docker: "npm:^2.0.0"
+    is-wsl: "npm:^2.1.1"
+  checksum: 4fc02ed3368dcd5d7247ad3566433ea2695b0713b041ebc0eeb2f0f9e5d4e29fc2068f5cdd500976b3464e77fe8b61662b1b059c73233ccc601fe8b16d6c1cd6
   languageName: node
   linkType: hard
 
@@ -27357,6 +27867,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-throttle@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "p-throttle@npm:4.1.1"
+  checksum: fe8709f3c3b1da7c033479375c2c302e80c1a5d86449013afa7cd46d1dc210bc824a7e4a9d088e66d31987d00878c2b5491bb2fe76246d4d2fc9a1636f5f8298
+  languageName: node
+  linkType: hard
+
 "p-try@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-try@npm:1.0.0"
@@ -27875,13 +28392,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pify@npm:4.0.1, pify@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "pify@npm:4.0.1"
-  checksum: 8b97cbf9dc6d4c1320cc238a2db0fc67547f9dc77011729ff353faf34f1936ea1a4d7f3c63b2f4980b253be77bcc72ea1e9e76ee3fd53cce2aafb6a8854d07ec
-  languageName: node
-  linkType: hard
-
 "pify@npm:5.0.0, pify@npm:^5.0.0":
   version: 5.0.0
   resolution: "pify@npm:5.0.0"
@@ -27903,6 +28413,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pify@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "pify@npm:4.0.1"
+  checksum: 8b97cbf9dc6d4c1320cc238a2db0fc67547f9dc77011729ff353faf34f1936ea1a4d7f3c63b2f4980b253be77bcc72ea1e9e76ee3fd53cce2aafb6a8854d07ec
+  languageName: node
+  linkType: hard
+
 "pinkie-promise@npm:^2.0.0":
   version: 2.0.1
   resolution: "pinkie-promise@npm:2.0.1"
@@ -28064,15 +28581,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"polyfill-crypto.getrandomvalues@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "polyfill-crypto.getrandomvalues@npm:1.0.0"
-  dependencies:
-    mersenne-twister: "npm:^1.0.1"
-  checksum: 73f0880b022af0c5930ef2d34a83a25e03196081082d8ceb204a3e5609a1a3d0dd1656a183073b17bc069a2c5749e44689cebdc4254dae6ed7e4e8b83f451964
-  languageName: node
-  linkType: hard
-
 "pony-cause@npm:^2.1.10":
   version: 2.1.10
   resolution: "pony-cause@npm:2.1.10"
@@ -28389,13 +28897,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prelude-ls@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "prelude-ls@npm:1.1.2"
-  checksum: 946a9f60d3477ca6b7d4c5e8e452ad1b98dc8aaa992cea939a6b926ac16cc4129d7217c79271dc808b5814b1537ad0af37f29a942e2eafbb92cfc5a1c87c38cb
-  languageName: node
-  linkType: hard
-
 "prepend-http@npm:^1.0.1":
   version: 1.0.4
   resolution: "prepend-http@npm:1.0.4"
@@ -28683,6 +29184,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"protobufjs@npm:^7.2.4":
+  version: 7.2.6
+  resolution: "protobufjs@npm:7.2.6"
+  dependencies:
+    "@protobufjs/aspromise": "npm:^1.1.2"
+    "@protobufjs/base64": "npm:^1.1.2"
+    "@protobufjs/codegen": "npm:^2.0.4"
+    "@protobufjs/eventemitter": "npm:^1.1.0"
+    "@protobufjs/fetch": "npm:^1.1.0"
+    "@protobufjs/float": "npm:^1.0.2"
+    "@protobufjs/inquire": "npm:^1.1.0"
+    "@protobufjs/path": "npm:^1.1.2"
+    "@protobufjs/pool": "npm:^1.1.0"
+    "@protobufjs/utf8": "npm:^1.1.0"
+    "@types/node": "npm:>=13.7.0"
+    long: "npm:^5.0.0"
+  checksum: 81ab853d28c71998d056d6b34f83c4bc5be40cb0b416585f99ed618aed833d64b2cf89359bad7474d345302f2b5e236c4519165f8483d7ece7fd5b0d9ac13f8b
+  languageName: node
+  linkType: hard
+
 "protocols@npm:^2.0.0, protocols@npm:^2.0.1":
   version: 2.0.1
   resolution: "protocols@npm:2.0.1"
@@ -28968,19 +29489,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"quote-stream@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "quote-stream@npm:1.0.2"
-  dependencies:
-    buffer-equal: "npm:0.0.1"
-    minimist: "npm:^1.1.3"
-    through2: "npm:^2.0.0"
-  bin:
-    quote-stream: bin/cmd.js
-  checksum: 25d615ea6dc406bb7fd865cb83bc897667e81974e6ff3f473f360f0ff2f3f6e00c07d0bd382b719b3588e52252e3b5565a4edc494a7fd190198fd4241eaa4180
-  languageName: node
-  linkType: hard
-
 "quote-unquote@npm:^1.0.0":
   version: 1.0.0
   resolution: "quote-unquote@npm:1.0.0"
@@ -29069,18 +29577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.1":
-  version: 2.5.1
-  resolution: "raw-body@npm:2.5.1"
-  dependencies:
-    bytes: "npm:3.1.2"
-    http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.4.24"
-    unpipe: "npm:1.0.0"
-  checksum: 280bedc12db3490ecd06f740bdcf66093a07535374b51331242382c0e130bb273ebb611b7bc4cba1b4b4e016cc7b1f4b05a6df885a6af39c2bc3b94c02291c84
-  languageName: node
-  linkType: hard
-
 "raw-body@npm:2.5.2":
   version: 2.5.2
   resolution: "raw-body@npm:2.5.2"
@@ -29760,7 +30256,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.4, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.3, readable-stream@npm:~2.3.6":
+"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.4, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6":
   version: 2.3.7
   resolution: "readable-stream@npm:2.3.7"
   dependencies:
@@ -30546,7 +31042,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:1.22.8, resolve@npm:^1.1.4, resolve@npm:^1.1.5, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.2, resolve@npm:^1.22.3, resolve@npm:^1.4.0":
+"resolve@npm:1.22.8, resolve@npm:^1.1.4, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.2, resolve@npm:^1.22.3, resolve@npm:^1.4.0":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -30572,7 +31068,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-? "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.6#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.18.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.3#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin<compat/resolve>"
+? "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.6#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.18.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.3#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin<compat/resolve>"
 :
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
@@ -31253,14 +31749,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "schema-utils@npm:3.1.2"
+"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
+  version: 3.3.0
+  resolution: "schema-utils@npm:3.3.0"
   dependencies:
     "@types/json-schema": "npm:^7.0.8"
     ajv: "npm:^6.12.5"
     ajv-keywords: "npm:^3.5.2"
-  checksum: f382d437dec0a424683444d782533260f9a8a4d82cf1c7e8f64305d81c5c927f7a0a645a414af78a891edd74d07a0e885120c1ef8254ce5843d01b4d67c0e81c
+  checksum: 2c7bbb1da967fdfd320e6cea538949006ec6e8c13ea560a4f94ff2c56809a8486fa5ec419e023452501a6befe1ca381e409c2798c24f4993c7c4094d97fdb258
   languageName: node
   linkType: hard
 
@@ -31276,21 +31772,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scope-analyzer@npm:^2.0.1":
-  version: 2.1.1
-  resolution: "scope-analyzer@npm:2.1.1"
-  dependencies:
-    array-from: "npm:^2.1.1"
-    dash-ast: "npm:^1.0.0"
-    es6-map: "npm:^0.1.5"
-    es6-set: "npm:^0.1.5"
-    es6-symbol: "npm:^3.1.1"
-    estree-is-function: "npm:^1.0.0"
-    get-assigned-identifiers: "npm:^1.1.0"
-  checksum: 228b04a6acc7eff7e1fa3ff4d391e61acfd92a56b123d9e43047c4b8e2f5e93a0708502bcb65ee4e93c910fb307dafd7def1d7dae93b1d547c3599f2d04da688
-  languageName: node
-  linkType: hard
-
 "scrypt-js@npm:3.0.1, scrypt-js@npm:^3.0.0, scrypt-js@npm:^3.0.1":
   version: 3.0.1
   resolution: "scrypt-js@npm:3.0.1"
@@ -31586,13 +32067,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shallow-copy@npm:~0.0.1":
-  version: 0.0.1
-  resolution: "shallow-copy@npm:0.0.1"
-  checksum: 916c3a8d687f4eea9f257f08b8c5c2e55aa092fee0f22ca86f241047a45a974af7df86a9169cfb7b7919a827f5095885928ec98e5bf8e17f076bac4f321639a6
-  languageName: node
-  linkType: hard
-
 "shasum-object@npm:^1.0.0":
   version: 1.0.0
   resolution: "shasum-object@npm:1.0.0"
@@ -31988,7 +32462,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sourcemap-codec@npm:^1.4.1, sourcemap-codec@npm:^1.4.4":
+"sourcemap-codec@npm:^1.4.4":
   version: 1.4.8
   resolution: "sourcemap-codec@npm:1.4.8"
   checksum: 6fc57a151e982b5c9468362690c6d062f3a0d4d8520beb68a82f319c79e7a4d7027eeb1e396de0ecc2cd19491e1d602b2d06fd444feac9b63dd43fea4c55a857
@@ -32172,15 +32646,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"static-eval@npm:^2.0.5":
-  version: 2.1.0
-  resolution: "static-eval@npm:2.1.0"
-  dependencies:
-    escodegen: "npm:^1.11.1"
-  checksum: 8387d3740648bac03d11989da0edf6dee4307da0d9b8ea3c54a993e9a566b1b83402bbce892dd6bd2d693a3eab66752c9d9e642ea7868748d87837a339f45eeb
-  languageName: node
-  linkType: hard
-
 "static-extend@npm:^0.1.1":
   version: 0.1.2
   resolution: "static-extend@npm:0.1.2"
@@ -32191,28 +32656,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"static-module@npm:^3.0.2":
-  version: 3.0.4
-  resolution: "static-module@npm:3.0.4"
-  dependencies:
-    acorn-node: "npm:^1.3.0"
-    concat-stream: "npm:~1.6.0"
-    convert-source-map: "npm:^1.5.1"
-    duplexer2: "npm:~0.1.4"
-    escodegen: "npm:^1.11.1"
-    has: "npm:^1.0.1"
-    magic-string: "npm:0.25.1"
-    merge-source-map: "npm:1.0.4"
-    object-inspect: "npm:^1.6.0"
-    readable-stream: "npm:~2.3.3"
-    scope-analyzer: "npm:^2.0.1"
-    shallow-copy: "npm:~0.0.1"
-    static-eval: "npm:^2.0.5"
-    through2: "npm:~2.0.3"
-  checksum: 238917a5d4e7c8be04fe78b71858f5c007aa2fbe4dde9229364bde3058f6ffdeb50ce614028edbdac40c25704e2988c6e10a9b743ca90bffd271e4a0f8885a82
-  languageName: node
-  linkType: hard
-
 "statuses@npm:2.0.1":
   version: 2.0.1
   resolution: "statuses@npm:2.0.1"
@@ -33180,15 +33623,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.7":
-  version: 5.3.8
-  resolution: "terser-webpack-plugin@npm:5.3.8"
+"terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.10":
+  version: 5.3.10
+  resolution: "terser-webpack-plugin@npm:5.3.10"
   dependencies:
-    "@jridgewell/trace-mapping": "npm:^0.3.17"
+    "@jridgewell/trace-mapping": "npm:^0.3.20"
     jest-worker: "npm:^27.4.5"
     schema-utils: "npm:^3.1.1"
     serialize-javascript: "npm:^6.0.1"
-    terser: "npm:^5.16.8"
+    terser: "npm:^5.26.0"
   peerDependencies:
     webpack: ^5.1.0
   peerDependenciesMeta:
@@ -33198,21 +33641,21 @@ __metadata:
       optional: true
     uglify-js:
       optional: true
-  checksum: 091f1af8ecd464335336390b53255438dd3b08328af8d1ea5f666477dddb217b2ff1a52581d86d42e12cbc4b82e38d94eb93a7ab519069ec2b2a54a7e2a737e4
+  checksum: fb1c2436ae1b4e983be043fa0a3d355c047b16b68f102437d08c736d7960c001e7420e2f722b9d99ce0dc70ca26a68cc63c0b82bc45f5b48671142b352a9d938
   languageName: node
   linkType: hard
 
-"terser@npm:^5.10.0, terser@npm:^5.16.8, terser@npm:^5.7.0":
-  version: 5.17.4
-  resolution: "terser@npm:5.17.4"
+"terser@npm:^5.10.0, terser@npm:^5.26.0, terser@npm:^5.7.0":
+  version: 5.29.2
+  resolution: "terser@npm:5.29.2"
   dependencies:
-    "@jridgewell/source-map": "npm:^0.3.2"
-    acorn: "npm:^8.5.0"
+    "@jridgewell/source-map": "npm:^0.3.3"
+    acorn: "npm:^8.8.2"
     commander: "npm:^2.20.0"
     source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 3b2b82e8cf93a40502a5abbac42b531f356c34f5b2090cd122a21f4596561a8fc743988ee2d07f44449c70b498db3d70712810ad80806496807e44b9d65abf1c
+  checksum: 062df6a8f99ea2635d1b3ce41cfd4180dea6e1c83db9b2cf4b525170b2446d10e069d2877d8dcb59fbf6045870efa17b56462b67045ef2d2b420870f9d144690
   languageName: node
   linkType: hard
 
@@ -33269,7 +33712,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3, through2@npm:~2.0.0, through2@npm:~2.0.3":
+"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3, through2@npm:~2.0.0":
   version: 2.0.5
   resolution: "through2@npm:2.0.5"
   dependencies:
@@ -33777,15 +34220,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-check@npm:~0.3.2":
-  version: 0.3.2
-  resolution: "type-check@npm:0.3.2"
-  dependencies:
-    prelude-ls: "npm:~1.1.2"
-  checksum: 11dec0b50d7c3fd2e630b4b074ba36918ed2b1efbc87dfbd40ba9429d49c58d12dad5c415ece69fcf358fa083f33466fc370f23ab91aa63295c45d38b3a60dda
-  languageName: node
-  linkType: hard
-
 "type-detect@npm:4.0.8, type-detect@npm:^4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
@@ -33793,10 +34227,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:4.10.2":
-  version: 4.10.2
-  resolution: "type-fest@npm:4.10.2"
-  checksum: 2b1ad1270d9fabeeb506ba831d513caeb05bfc852e5e012511d785ce9dc68d773fe0a42bddf857a362c7f3406244809c5b8a698b743bb7617d4a8c470672087f
+"type-fest@npm:4.13.1":
+  version: 4.13.1
+  resolution: "type-fest@npm:4.13.1"
+  checksum: 3a5db31e45d79dae6d7810b3e6180fed117cfeec7b9f0d3ebbc3780dc53297f9f0dea1752cd8d1f42c2f8206f9a1091a18aa38eb3cb9923a4c79aea480404182
   languageName: node
   linkType: hard
 
@@ -33856,6 +34290,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^4.0.0":
+  version: 4.15.0
+  resolution: "type-fest@npm:4.15.0"
+  checksum: 8f897551877daa0df7bb17a21b6acd8a21ac5a0bdb14dbfd353b16013fed99f23c6d9c12a2c7685c8dededb4739ec8bfb120a914330f8b11a478a89758a11acc
+  languageName: node
+  linkType: hard
+
 "type-is@npm:^1.6.16, type-is@npm:~1.6.18":
   version: 1.6.18
   resolution: "type-is@npm:1.6.18"
@@ -33907,23 +34348,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.0.4, typescript@npm:^5.2.2, typescript@npm:~5.3.3":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
+"typescript@npm:^5.0.4, typescript@npm:^5.2.2, typescript@npm:~5.4.5":
+  version: 5.4.5
+  resolution: "typescript@npm:5.4.5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18
+  checksum: d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.3.3#optional!builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
+"typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.4.5#optional!builtin<compat/typescript>":
+  version: 5.4.5
+  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=e012d7"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d
+  checksum: 584be8bac7112ad49a9eb9992f71d542b1ff2fafb5bb315e1c196145e8feab589f1d7223cfb2d5df6770789582e6918f8287d1f2f89911b38eb80e29c560ad00
   languageName: node
   linkType: hard
 
@@ -34066,6 +34507,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici@npm:5.28.4":
+  version: 5.28.4
+  resolution: "undici@npm:5.28.4"
+  dependencies:
+    "@fastify/busboy": "npm:^2.0.0"
+  checksum: a666a9f5ac4270c659fafc33d78b6b5039a0adbae3e28f934774c85dcc66ea91da907896f12b414bd6f578508b44d5dc206fa636afa0e49a4e1c9e99831ff065
+  languageName: node
+  linkType: hard
+
 "unherit@npm:^1.0.4":
   version: 1.1.2
   resolution: "unherit@npm:1.1.2"
@@ -34458,12 +34908,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uri-js@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "uri-js@npm:4.2.2"
+"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "uri-js@npm:4.4.1"
   dependencies:
     punycode: "npm:^2.1.0"
-  checksum: e9499d30bfa7559acc255ab196bf7be0db9e5e5550cc0dfd8aeaeabbe423c323b18e261b31b996a409465b29f6ad814f8683f0c4f476ee347a57103dba0fb7f7
+  checksum: b271ca7e3d46b7160222e3afa3e531505161c9a4e097febae9664e4b59912f4cbe94861361a4175edac3a03fee99d91e44b6a58c17a634bc5a664b19fc76fbcb
   languageName: node
   linkType: hard
 
@@ -34702,12 +35152,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "uuid@npm:9.0.0"
+"uuid@npm:^9.0.0, uuid@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "uuid@npm:9.0.1"
   bin:
     uuid: dist/bin/uuid
-  checksum: 23857699a616d1b48224bc2b8440eae6e57d25463c3a0200e514ba8279dfa3bde7e92ea056122237839cfa32045e57d8f8f4a30e581d720fd72935572853ae2e
+  checksum: 9d0b6adb72b736e36f2b1b53da0d559125ba3e39d913b6072f6f033e0c87835b414f0836b45bcfaf2bdf698f92297fea1c3cc19b0b258bc182c9c43cc0fab9f2
   languageName: node
   linkType: hard
 
@@ -34766,6 +35216,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"valid-url@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "valid-url@npm:1.0.9"
+  checksum: 343dfaf85eb3691dc8eb93f7bc007be1ee6091e6c6d1a68bf633cb85e4bf2930e34ca9214fb2c3330de5b652510b257a8ee1ff0a0a37df0925e9dabf93ee512d
+  languageName: node
+  linkType: hard
+
 "validate-npm-package-license@npm:^3.0.1":
   version: 3.0.4
   resolution: "validate-npm-package-license@npm:3.0.4"
@@ -35158,13 +35615,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"watchpack@npm:^2.2.0, watchpack@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "watchpack@npm:2.4.0"
+"watchpack@npm:^2.2.0, watchpack@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "watchpack@npm:2.4.1"
   dependencies:
     glob-to-regexp: "npm:^0.4.1"
     graceful-fs: "npm:^4.1.2"
-  checksum: 4280b45bc4b5d45d5579113f2a4af93b67ae1b9607cc3d86ae41cdd53ead10db5d9dc3237f24256d05ef88b28c69a02712f78e434cb7ecc8edaca134a56e8cab
+  checksum: 0736ebd20b75d3931f9b6175c819a66dee29297c1b389b2e178bc53396a6f867ecc2fd5d87a713ae92dcb73e487daec4905beee20ca00a9e27f1184a7c2bca5e
   languageName: node
   linkType: hard
 
@@ -35190,13 +35647,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web3-stream-provider@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "web3-stream-provider@npm:4.0.0"
+"web3-stream-provider@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "web3-stream-provider@npm:5.0.0"
   dependencies:
-    readable-stream: "npm:^2.0.5"
-    uuid: "npm:^3.3.3"
-  checksum: 89e00b55d9253dfe2f18185ede9af5af170d49ff50638750c2bacd9ebc14b94d62c9a601271cb790034139ff7393e72d08229340f31495c018594913d074e21a
+    readable-stream: "npm:^3.6.2"
+    uuid: "npm:^9.0.0"
+  checksum: 33f9fc359b381dbe20818027018de281cc0be452cb86ebf09eae80c0bfac18e4149498033f44ee7bfaf8d9017335621d9c9db42186c0f60872a0f76df9f50657
   languageName: node
   linkType: hard
 
@@ -35292,40 +35749,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5, webpack@npm:^5.75.0":
-  version: 5.82.1
-  resolution: "webpack@npm:5.82.1"
+"webpack@npm:5, webpack@npm:^5.91.0":
+  version: 5.91.0
+  resolution: "webpack@npm:5.91.0"
   dependencies:
     "@types/eslint-scope": "npm:^3.7.3"
-    "@types/estree": "npm:^1.0.0"
-    "@webassemblyjs/ast": "npm:^1.11.5"
-    "@webassemblyjs/wasm-edit": "npm:^1.11.5"
-    "@webassemblyjs/wasm-parser": "npm:^1.11.5"
+    "@types/estree": "npm:^1.0.5"
+    "@webassemblyjs/ast": "npm:^1.12.1"
+    "@webassemblyjs/wasm-edit": "npm:^1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:^1.12.1"
     acorn: "npm:^8.7.1"
-    acorn-import-assertions: "npm:^1.7.6"
-    browserslist: "npm:^4.14.5"
+    acorn-import-assertions: "npm:^1.9.0"
+    browserslist: "npm:^4.21.10"
     chrome-trace-event: "npm:^1.0.2"
-    enhanced-resolve: "npm:^5.14.0"
+    enhanced-resolve: "npm:^5.16.0"
     es-module-lexer: "npm:^1.2.1"
     eslint-scope: "npm:5.1.1"
     events: "npm:^3.2.0"
     glob-to-regexp: "npm:^0.4.1"
-    graceful-fs: "npm:^4.2.9"
+    graceful-fs: "npm:^4.2.11"
     json-parse-even-better-errors: "npm:^2.3.1"
     loader-runner: "npm:^4.2.0"
     mime-types: "npm:^2.1.27"
     neo-async: "npm:^2.6.2"
-    schema-utils: "npm:^3.1.2"
+    schema-utils: "npm:^3.2.0"
     tapable: "npm:^2.1.1"
-    terser-webpack-plugin: "npm:^5.3.7"
-    watchpack: "npm:^2.4.0"
+    terser-webpack-plugin: "npm:^5.3.10"
+    watchpack: "npm:^2.4.1"
     webpack-sources: "npm:^3.2.3"
   peerDependenciesMeta:
     webpack-cli:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: ea2b5c5cd0a6180a42d2436751f4df9a14709f3c12b041627af37b270a6d01fb0088259b8779b2a79d8b0aae41fb3c501a1fadd199ec250842fe3fcf20bce0e7
+  checksum: 647ca53c15fe0fa1af4396a7257d7a93cbea648d2685e565a11cc822a9e3ea9316345250987d75f02c0b45dae118814f094ec81908d1032e77a33cd6470b289e
   languageName: node
   linkType: hard
 
@@ -35522,7 +35979,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wordwrap@npm:^1.0.0, wordwrap@npm:~1.0.0":
+"wordwrap@npm:^1.0.0":
   version: 1.0.0
   resolution: "wordwrap@npm:1.0.0"
   checksum: 497d40beb2bdb08e6d38754faa17ce20b0bf1306327f80cb777927edb23f461ee1f6bc659b3c3c93f26b08e1cf4b46acc5bae8fda1f0be3b5ab9a1a0211034cd
@@ -35984,6 +36441,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zod@npm:^3.22.4":
+  version: 3.22.4
+  resolution: "zod@npm:3.22.4"
+  checksum: 73622ca36a916f785cf528fe612a884b3e0f183dbe6b33365a7d0fc92abdbedf7804c5e2bd8df0a278e1472106d46674281397a3dd800fa9031dc3429758c6ac
+  languageName: node
+  linkType: hard
+
 "zstd-codec@npm:^0.1.4":
   version: 0.1.4
   resolution: "zstd-codec@npm:0.1.4"